Merge MTD fixes from 4.0 into -next

This commit is contained in:
Brian Norris 2015-04-22 10:29:19 -07:00
commit 3e550d2396

View File

@ -526,6 +526,7 @@ config MTD_NAND_SUNXI
config MTD_NAND_HISI504
tristate "Support for NAND controller on Hisilicon SoC Hip04"
depends on HAS_DMA
help
Enables support for NAND controller on Hisilicon SoC Hip04.