aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2015-04-22 10:29:19 -0700
committerBrian Norris <computersforpeace@gmail.com>2015-04-22 10:29:19 -0700
commit3e550d2396d9deef77328237ed992e19dcfefca5 (patch)
tree953c7e2d7fb69e18a117b2155cccd39f6aa06465
parentmtd: spi-nor: Add support for Macronix mx25u6435f serial flash (diff)
parentmtd: nand: MTD_NAND_HISI504 should depend on HAS_DMA (diff)
downloadlinux-dev-3e550d2396d9deef77328237ed992e19dcfefca5.tar.xz
linux-dev-3e550d2396d9deef77328237ed992e19dcfefca5.zip
Merge MTD fixes from 4.0 into -next
-rw-r--r--drivers/mtd/nand/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 5b76a173cd95..5897d8d8fa5a 100644
--- 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.