Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index f7801eb..cfe288a 100644 (file)
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -1,5 +1,5 @@
 # drivers/mtd/nand/Kconfig
-# $Id: Kconfig,v 1.26 2005/01/05 12:42:24 dwmw2 Exp $
+# $Id: Kconfig,v 1.35 2005/11/07 11:14:30 gleixner Exp $
 
 menu "NAND Flash Device Drivers"
        depends on MTD!=n
@@ -25,56 +25,42 @@ config MTD_NAND_VERIFY_WRITE
 
 config MTD_NAND_AUTCPU12
        tristate "SmartMediaCard on autronix autcpu12 board"
-       depends on ARM && MTD_NAND && ARCH_AUTCPU12
+       depends on MTD_NAND && ARCH_AUTCPU12
        help
-         This enables the driver for the autronix autcpu12 board to 
+         This enables the driver for the autronix autcpu12 board to
          access the SmartMediaCard.
 
 config MTD_NAND_EDB7312
        tristate "Support for Cirrus Logic EBD7312 evaluation board"
-       depends on ARM && MTD_NAND && ARCH_EDB7312
+       depends on MTD_NAND && ARCH_EDB7312
        help
-         This enables the driver for the Cirrus Logic EBD7312 evaluation 
+         This enables the driver for the Cirrus Logic EBD7312 evaluation
          board to access the onboard NAND Flash.
 
 config MTD_NAND_H1900
        tristate "iPAQ H1900 flash"
-       depends on ARM && MTD_NAND && ARCH_PXA && MTD_PARTITIONS
+       depends on MTD_NAND && ARCH_PXA && MTD_PARTITIONS
        help
          This enables the driver for the iPAQ h1900 flash.
 
 config MTD_NAND_SPIA
        tristate "NAND Flash device on SPIA board"
-       depends on ARM && ARCH_P720T && MTD_NAND
+       depends on ARCH_P720T && MTD_NAND
        help
          If you had to ask, you don't have one. Say 'N'.
 
 config MTD_NAND_TOTO
        tristate "NAND Flash device on TOTO board"
-       depends on ARM && ARCH_OMAP && MTD_NAND
+       depends on ARCH_OMAP && MTD_NAND
        help
          Support for NAND flash on Texas Instruments Toto platform.
 
 config MTD_NAND_IDS
        tristate
 
-config MTD_NAND_TX4925NDFMC
-       tristate "SmartMedia Card on Toshiba RBTX4925 reference board"
-       depends on TOSHIBA_RBTX4925 && MTD_NAND && TOSHIBA_RBTX4925_MPLEX_NAND
-       help
-         This enables the driver for the NAND flash device found on the
-         Toshiba RBTX4925 reference board, which is a SmartMediaCard.
-
-config MTD_NAND_TX4938NDFMC
-       tristate "NAND Flash device on Toshiba RBTX4938 reference board"
-       depends on TOSHIBA_RBTX4938 && MTD_NAND && TOSHIBA_RBTX4938_MPLEX_NAND 
-       help
-         This enables the driver for the NAND flash device found on the
-         Toshiba RBTX4938 reference board.
-
 config MTD_NAND_AU1550
-       tristate "Au1550 NAND support"
-       depends on SOC_AU1550 && MTD_NAND
+       tristate "Au1550/1200 NAND support"
+       depends on (SOC_AU1200 || SOC_AU1550) && MTD_NAND
        help
          This enables the driver for the NAND flash controller on the
          AMD/Alchemy 1550 SOC.
@@ -85,7 +71,7 @@ config MTD_NAND_RTC_FROM4
        select REED_SOLOMON
        select REED_SOLOMON_DEC8
        help
-         This enables the driver for the Renesas Technology AG-AND 
+         This enables the driver for the Renesas Technology AG-AND
          flash interface board (FROM_BOARD4)
 
 config MTD_NAND_PPCHAMELEONEVB
@@ -95,13 +81,14 @@ config MTD_NAND_PPCHAMELEONEVB
          This enables the NAND flash driver on the PPChameleon EVB Board.
 
 config MTD_NAND_S3C2410
-       tristate "NAND Flash support for S3C2410 SoC"
+       tristate "NAND Flash support for S3C2410/S3C2440 SoC"
        depends on ARCH_S3C2410 && MTD_NAND
        help
-         This enables the NAND flash controller on the S3C2410.
+         This enables the NAND flash controller on the S3C2410 and S3C2440
+         SoCs
 
          No board specfic support is done by this driver, each board
-         must advertise a platform_device for the driver to attach. 
+         must advertise a platform_device for the driver to attach.
 
 config MTD_NAND_S3C2410_DEBUG
        bool "S3C2410 NAND driver debug"
@@ -191,17 +178,16 @@ config MTD_NAND_DISKONCHIP_BBTWRITE
          Even if you leave this disabled, you can enable BBT writes at module
          load time (assuming you build diskonchip as a module) with the module
          parameter "inftl_bbt_write=1".
-         
- config MTD_NAND_SHARPSL
-       bool "Support for NAND Flash on Sharp SL Series (C7xx + others)"
-       depends on MTD_NAND     && ARCH_PXA
- 
- config MTD_NAND_NANDSIM
-       bool "Support for NAND Flash Simulator"
-       depends on MTD_NAND && MTD_PARTITIONS
 
+config MTD_NAND_SHARPSL
+       tristate "Support for NAND Flash on Sharp SL Series (C7xx + others)"
+       depends on MTD_NAND && ARCH_PXA
+
+config MTD_NAND_NANDSIM
+       tristate "Support for NAND Flash Simulator"
+       depends on MTD_NAND && MTD_PARTITIONS
        help
          The simulator may simulate verious NAND flash chips for the
          MTD nand layer.
- 
+
 endmenu