Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mirror_ubuntu-artful-kernel.git] / drivers / mtd / nand / Kconfig

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 677cd53f18c3416c489a11b3934c42b16c14a49a..7a67218e86fc20b6a71bc664bceb95b8eef9d0ae 100644 (file)
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -25,6 +25,10 @@ config MTD_NAND_ECC_SMC
          Software ECC according to the Smart Media Specification.
          The original Linux implementation had byte 0 and 1 swapped.
 
+config MTD_SM_COMMON
+       tristate
+       default n
+
 config MTD_NAND_MUSEUM_IDS
        bool "Enable chip ids for obsolete ancient NAND devices"
        depends on MTD_NAND
@@ -95,12 +99,6 @@ config MTD_NAND_OMAP_PREFETCH_DMA
         or in DMA interrupt mode.
         Say y for DMA mode or MPU mode will be used
 
-config MTD_NAND_TS7250
-       tristate "NAND Flash device on TS-7250 board"
-       depends on MACH_TS72XX
-       help
-         Support for NAND flash on Technologic Systems TS-7250 platform.
-
 config MTD_NAND_IDS
        tristate
 
@@ -442,6 +440,13 @@ config MTD_NAND_FSL_UPM
          Enables support for NAND Flash chips wired onto Freescale PowerPC
          processor localbus with User-Programmable Machine support.
 
+config MTD_NAND_MPC5121_NFC
+       tristate "MPC5121 built-in NAND Flash Controller support"
+       depends on PPC_MPC512x
+       help
+         This enables the driver for the NAND flash controller on the
+         MPC5121 SoC.
+
 config MTD_NAND_MXC
        tristate "MXC NAND support"
        depends on ARCH_MX2 || ARCH_MX3
@@ -481,11 +486,11 @@ config MTD_NAND_SOCRATES
        help
          Enables support for NAND Flash chips wired onto Socrates board.
 
-config MTD_NAND_W90P910
-       tristate "Support for NAND on w90p910 evaluation board."
+config MTD_NAND_NUC900
+       tristate "Support for NAND on Nuvoton NUC9xx/w90p910 evaluation boards."
        depends on ARCH_W90X900 && MTD_PARTITIONS
        help
          This enables the driver for the NAND Flash on evaluation board based
-         on w90p910.
+         on w90p910 / NUC9xx.
 
 endif # MTD_NAND