Merge tag 'for-linus-20121219' of git://git.infradead.org/linux-mtd

[linux-beck.git] / drivers / mtd / nand / Kconfig

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 37ffe56e74a43d57d8408758da367bce78583a41..5819eb575210115bf0e25d28bde1298afc2f6995 100644 (file)
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -49,13 +49,6 @@ config MTD_NAND_MUSEUM_IDS
          NAND chips (page size 256 byte, erase size 4-8KiB). The IDs
          of these chips were reused by later, larger chips.
 
-config MTD_NAND_AUTCPU12
-       tristate "SmartMediaCard on autronix autcpu12 board"
-       depends on ARCH_AUTCPU12
-       help
-         This enables the driver for the autronix autcpu12 board to
-         access the SmartMediaCard.
-
 config MTD_NAND_DENALI
         tristate "Support Denali NAND controller"
         help
@@ -100,12 +93,6 @@ config MTD_NAND_GPIO
        help
          This enables a GPIO based NAND flash driver.
 
-config MTD_NAND_SPIA
-       tristate "NAND Flash device on SPIA board"
-       depends on ARCH_P720T
-       help
-         If you had to ask, you don't have one. Say 'N'.
-
 config MTD_NAND_AMS_DELTA
        tristate "NAND Flash device on Amstrad E3"
        depends on MACH_AMS_DELTA
@@ -575,7 +562,7 @@ config MTD_NAND_JZ4740
 
 config MTD_NAND_FSMC
        tristate "Support for NAND on ST Micros FSMC"
-       depends on PLAT_SPEAR || PLAT_NOMADIK || MACH_U300
+       depends on PLAT_SPEAR || ARCH_NOMADIK || ARCH_U8500 || MACH_U300
        help
          Enables support for NAND Flash chips on the ST Microelectronics
          Flexible Static Memory Controller (FSMC)