diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-05 22:23:16 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-05 22:23:16 +0100 |
| commit | 4397989fc91ed289909ecf307c2dc21cee0e7905 (patch) | |
| tree | fc28a1e179caa3570146ece045cd2bf198f6bd89 /drivers/mtd/maps/Kconfig | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po... (diff) | |
| parent | mtd/maps: gpio-addr-flash: depend on GPIO arch support (diff) | |
| download | linux-4397989fc91ed289909ecf307c2dc21cee0e7905.tar.xz linux-4397989fc91ed289909ecf307c2dc21cee0e7905.zip | |
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/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index 841e085ab74a..14be0755d7cd 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 |