Merge MTD fixes from 4.0 into -next

3e550d23 · Brian Norris · 81a1209c · 5e0899db · 3e550d23
隐藏空白更改
内联并排

Showing with 1 addition and 0 deletion

drivers/mtd/nand/Kconfig drivers/mtd/nand/Kconfig +1 -0

未找到文件。
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -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.