Merge git://git.infradead.org/mtd-2.6

[safe/jmp/linux-2.6] / drivers / mtd / maps / Kconfig

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 3a9a960..4c364d4 100644 (file)
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -1,5 +1,3 @@
-# drivers/mtd/maps/Kconfig
-
 menu "Mapping drivers for chip access"
        depends on MTD!=n
 
@@ -74,7 +72,7 @@ config MTD_PHYSMAP_BANKWIDTH
 
 config MTD_PHYSMAP_OF
        tristate "Flash device in physical memory map based on OF description"
-       depends on PPC_OF && (MTD_CFI || MTD_JEDECPROBE || MTD_ROM)
+       depends on (MICROBLAZE || PPC_OF) && (MTD_CFI || MTD_JEDECPROBE || MTD_ROM)
        help
          This provides a 'mapping' driver which allows the NOR Flash and
          ROM driver code to communicate with chips which are mapped
@@ -361,12 +359,6 @@ config MTD_SA1100
          the SA1100 and SA1110, including the Assabet and the Compaq iPAQ.
          If you have such a board, say 'Y'.
 
-config MTD_IPAQ
-       tristate "CFI Flash device mapped on Compaq/HP iPAQ"
-       depends on IPAQ_HANDHELD && MTD_CFI
-       help
-         This provides a driver for the on-board flash of the iPAQ.
-
 config MTD_DC21285
        tristate "CFI Flash device mapped on DC21285 Footbridge"
        depends on MTD_CFI && ARCH_FOOTBRIDGE && MTD_COMPLEX_MAPPINGS
@@ -389,9 +381,9 @@ config MTD_IXP2000
        depends on MTD_CFI && MTD_COMPLEX_MAPPINGS && ARCH_IXP2000
        help
          This enables MTD access to flash devices on platforms based
-         on Intel's IXP2000 family of network processors such as the
-         IXDP425 and Coyote. If you have an IXP2000 based board and
-         would like to use the flash chips on it, say 'Y'.
+         on Intel's IXP2000 family of network processors. If you have an
+         IXP2000 based board and would like to use the flash chips on it,
+         say 'Y'.
 
 config MTD_FORTUNET
        tristate "CFI Flash device mapped on the FortuNet board"
@@ -486,6 +478,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