1 files changed, 28 insertions, 3 deletions

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index f1d60b6f048e..8f9c3baeb38e 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -91,6 +91,25 @@ config MTD_NAND_AU1550
           This enables the driver for the NAND flash controller on the
           AMD/Alchemy 1550 SOC.
 
+config MTD_NAND_BF5XX
+        tristate "Blackfin on-chip NAND Flash Controller driver"
+        depends on BF54x && MTD_NAND
+        help
+          This enables the Blackfin on-chip NAND flash controller
+
+          No board specific support is done by this driver, each board
+          must advertise a platform_device for the driver to attach.
+
+          This driver can also be built as a module. If so, the module
+          will be called bf5xx-nand.
+
+config MTD_NAND_BF5XX_HWECC
+        bool "BF5XX NAND Hardware ECC"
+        depends on MTD_NAND_BF5XX
+        help
+          Enable the use of the BF5XX's internal ECC generator when
+          using NAND.
+
 config MTD_NAND_RTC_FROM4
         tristate "Renesas Flash ROM 4-slot interface board (FROM_BOARD4)"
         depends on SH_SOLUTION_ENGINE
@@ -134,10 +153,10 @@ config MTD_NAND_S3C2410_HWECC
 
 config MTD_NAND_NDFC
         tristate "NDFC NanD Flash Controller"
-        depends on 44x
+        depends on 4xx && !PPC_MERGE
         select MTD_NAND_ECC_SMC
         help
-         NDFC Nand Flash Controllers are integrated in EP44x SoCs
+         NDFC Nand Flash Controllers are integrated in IBM/AMCC's 4xx SoCs
 
 config MTD_NAND_S3C2410_CLKSTOP
         bool "S3C2410 NAND IDLE clock stop"
@@ -237,7 +256,7 @@ config MTD_NAND_CAFE
         select REED_SOLOMON
         select REED_SOLOMON_DEC16
         help
-          Use NAND flash attached to the CAFÉ chip designed for the $100
+          Use NAND flash attached to the CAFÉ chip designed for the OLPC
           laptop.
 
 config MTD_NAND_CS553X
@@ -280,5 +299,11 @@ config MTD_NAND_PLATFORM
           devices. You will need to provide platform-specific functions
           via platform_data.
 
+config MTD_ALAUDA
+        tristate "MTD driver for Olympus MAUSB-10 and Fijufilm DPC-R1"
+        depends on MTD_NAND && USB
+        help
+          These two (and possibly other) Alauda-based cardreaders for
+          SmartMedia and xD allow raw flash access.
 
 endif # MTD_NAND