Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 043d50fb6ef65abd085a98cc42fe8ca6942dc85c..d071eabdabaf8ccfd2b2bd112b0d6e7a5e698036 100644 (file)
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -445,6 +445,13 @@ config MTD_CEIVA
          PhotoMax Digital Picture Frame.
          If you have such a device, say 'Y'.
 
+config MTD_NOR_TOTO
+       tristate "NOR Flash device on TOTO board"
+       depends on ARCH_OMAP && OMAP_TOTO
+       help
+         This enables access to the NOR flash on the Texas Instruments
+         TOTO board.
+
 config MTD_H720X
        tristate "Hynix evaluation board mappings"
        depends on MTD_CFI && ( ARCH_H7201 || ARCH_H7202 )
@@ -551,5 +558,15 @@ config MTD_PLATRAM
 
          This selection automatically selects the map_ram driver.
 
-endmenu
+config MTD_VMU
+       tristate "Map driver for Dreamcast VMU"
+       depends on MAPLE
+       help
+         This driver enables access to the Dreamcast Visual Memory Unit (VMU).
 
+         Most Dreamcast users will want to say Y here.
+
+         To build this as a module select M here, the module will be called
+         vmu-flash.
+
+endmenu