upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

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

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 89ab7da..f7801eb 100644 (file)
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -1,5 +1,5 @@
 # drivers/mtd/nand/Kconfig
-# $Id: Kconfig,v 1.22 2004/10/05 22:11:46 gleixner Exp $
+# $Id: Kconfig,v 1.26 2005/01/05 12:42:24 dwmw2 Exp $
 
 menu "NAND Flash Device Drivers"
        depends on MTD!=n
@@ -7,6 +7,7 @@ menu "NAND Flash Device Drivers"
 config MTD_NAND
        tristate "NAND Device Support"
        depends on MTD
+       select MTD_NAND_IDS
        help
          This enables support for accessing all type of NAND flash
          devices. For further information see
@@ -56,8 +57,6 @@ config MTD_NAND_TOTO
 
 config MTD_NAND_IDS
        tristate
-       default y if MTD_NAND = y || MTD_DOC2000 = y || MTD_DOC2001 = y || MTD_DOC2001PLUS = y
-       default m if MTD_NAND = m || MTD_DOC2000 = m || MTD_DOC2001 = m || MTD_DOC2001PLUS = m
 
 config MTD_NAND_TX4925NDFMC
        tristate "SmartMedia Card on Toshiba RBTX4925 reference board"
@@ -192,4 +191,17 @@ 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
+
+       help
+         The simulator may simulate verious NAND flash chips for the
+         MTD nand layer.
+ 
 endmenu