Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze

[linux-2.6.git] / drivers / mtd / maps / Kconfig

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 7a58bd5522fd736a83584acaf9a9472b4a57e876..841e085ab74ab198fafe9e801e5a3df2307f0da3 100644 (file)
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -74,7 +74,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
@@ -484,9 +484,19 @@ config MTD_BFIN_ASYNC
 
          If compiled as a module, it will be called bfin-async-flash.
 
+config MTD_GPIO_ADDR
+       tristate "GPIO-assisted Flash Chip Support"
+       depends on MTD_COMPLEX_MAPPINGS
+       select MTD_PARTITIONS
+       help
+         Map driver which allows flashes to be partially physically addressed
+         and assisted by GPIOs.
+
+         If compiled as a module, it will be called gpio-addr-flash.
+
 config MTD_UCLINUX
        bool "Generic uClinux RAM/ROM filesystem support"
-       depends on MTD_PARTITIONS && MTD_RAM && !MMU
+       depends on MTD_PARTITIONS && MTD_RAM=y && !MMU
        help
          Map driver to support image based filesystems for uClinux.