aboutsummaryrefslogtreecommitdiff
path: root/drivers/mtd/maps/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-11-05 13:23:16 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-11-05 13:23:16 -0800
commit4397989fc91ed289909ecf307c2dc21cee0e7905 (patch)
treefc28a1e179caa3570146ece045cd2bf198f6bd89 /drivers/mtd/maps/Kconfig
parent1bbc9a66d0194449f32c2aa18be40db5744dbd85 (diff)
parentde19d02b731478877ce8b1ccf371c2b2142ac80e (diff)
Merge git://git.infradead.org/users/dwmw2/mtd-2.6.32
* git://git.infradead.org/users/dwmw2/mtd-2.6.32: mtd/maps: gpio-addr-flash: depend on GPIO arch support mtd/maps: gpio-addr-flash: pull in linux/ headers rather than asm/ mtd: nand: fix htmldocs warnings
Diffstat (limited to 'drivers/mtd/maps/Kconfig')
-rw-r--r--drivers/mtd/maps/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 841e085ab74..14be0755d7c 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -486,6 +486,7 @@ config MTD_BFIN_ASYNC
config MTD_GPIO_ADDR
tristate "GPIO-assisted Flash Chip Support"
+ depends on GENERIC_GPIO || GPIOLIB
depends on MTD_COMPLEX_MAPPINGS
select MTD_PARTITIONS
help