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 / devices / Kconfig

diff --git a/drivers/mtd/devices/Kconfig b/drivers/mtd/devices/Kconfig
index c4a56a4..7fac438 100644 (file)
--- a/drivers/mtd/devices/Kconfig
+++ b/drivers/mtd/devices/Kconfig
@@ -1,5 +1,5 @@
 # drivers/mtd/maps/Kconfig
-# $Id: Kconfig,v 1.15 2004/12/22 17:51:15 joern Exp $
+# $Id: Kconfig,v 1.18 2005/11/07 11:14:24 gleixner Exp $
 
 menu "Self-contained MTD device drivers"
        depends on MTD!=n
@@ -47,6 +47,22 @@ config MTD_MS02NV
          accelerator.  Say Y here if you have a DECstation 5000/2x0 or a
          DECsystem 5900 equipped with such a module.
 
+config MTD_DATAFLASH
+       tristate "Support for AT45xxx DataFlash"
+       depends on MTD && SPI_MASTER && EXPERIMENTAL
+       help
+         This enables access to AT45xxx DataFlash chips, using SPI.
+         Sometimes DataFlash chips are packaged inside MMC-format
+         cards; at this writing, the MMC stack won't handle those.
+
+config MTD_M25P80
+       tristate "Support for M25 SPI Flash"
+       depends on MTD && SPI_MASTER && EXPERIMENTAL
+       help
+         This enables access to ST M25P80 and similar SPI flash chips,
+         used for program and data storage.  Set up your spi devices
+         with the right board-specific platform data.
+
 config MTD_SLRAM
        tristate "Uncached system RAM"
        depends on MTD
@@ -110,11 +126,11 @@ config MTDRAM_ABS_POS
          If you have system RAM accessible by the CPU but not used by Linux
          in normal operation, you can give the physical address at which the
          available RAM starts, and the MTDRAM driver will use it instead of
-         allocating space from Linux's available memory. Otherwise, leave 
+         allocating space from Linux's available memory. Otherwise, leave
          this set to zero. Most people will want to leave this as zero.
 
-config MTD_BLKMTD
-       tristate "MTD emulation using block device"
+config MTD_BLOCK2MTD
+       tristate "MTD using block device"
        depends on MTD
        help
          This driver allows a block device to appear as an MTD. It would
@@ -125,15 +141,6 @@ config MTD_BLKMTD
          Testing MTD users (eg JFFS2) on large media and media that might
          be removed during a write (using the floppy drive).
 
-config MTD_BLOCK2MTD
-       tristate "MTD using block device (rewrite)"
-       depends on MTD && EXPERIMENTAL
-       help
-         This driver is basically the same at MTD_BLKMTD above, but
-         experienced some interface changes plus serious speedups.  In
-         the long term, it should replace MTD_BLKMTD.  Right now, you
-         shouldn't entrust important data to it yet.
-
 comment "Disk-On-Chip Device Drivers"
 
 config MTD_DOC2000
@@ -165,7 +172,7 @@ config MTD_DOC2001
        select MTD_DOCPROBE
        select MTD_NAND_IDS
        ---help---
-         This provides an alternative MTD device driver for the M-Systems 
+         This provides an alternative MTD device driver for the M-Systems
          DiskOnChip Millennium devices.  Use this if you have problems with
          the combined DiskOnChip 2000 and Millennium driver above.  To get
          the DiskOnChip probe code to load and use this driver instead of
@@ -192,7 +199,7 @@ config MTD_DOC2001PLUS
 
          If you use this device, you probably also want to enable the INFTL
          'Inverse NAND Flash Translation Layer' option below, which is used
-         to emulate a block device by using a kind of file system on the 
+         to emulate a block device by using a kind of file system on the
          flash chips.
 
          NOTE: This driver will soon be replaced by the new DiskOnChip driver
@@ -202,6 +209,7 @@ config MTD_DOC2001PLUS
 config MTD_DOCPROBE
        tristate
        select MTD_DOCECC
+       select OBSOLETE_INTERMODULE
 
 config MTD_DOCECC
        tristate