fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/drivers/mtd/devices/Kconfig b/drivers/mtd/devices/Kconfig
index dd628cb..440f685 100644 (file)
--- a/drivers/mtd/devices/Kconfig
+++ b/drivers/mtd/devices/Kconfig
@@ -47,6 +47,11 @@ config MTD_MS02NV
          accelerator.  Say Y here if you have a DECstation 5000/2x0 or a
          DECsystem 5900 equipped with such a module.
 
          accelerator.  Say Y here if you have a DECstation 5000/2x0 or a
          DECsystem 5900 equipped with such a module.
 

+         If you want to compile this driver as a module ( = code which can be
+         inserted in and removed from the running kernel whenever you want),
+         say M here and read <file:Documentation/modules.txt>.  The module will
+         be called ms02-nv.o.
+

 config MTD_DATAFLASH
        tristate "Support for AT45xxx DataFlash"
        depends on MTD && SPI_MASTER && EXPERIMENTAL
 config MTD_DATAFLASH
        tristate "Support for AT45xxx DataFlash"
        depends on MTD && SPI_MASTER && EXPERIMENTAL


@@ -129,9 +134,9 @@ config MTDRAM_ABS_POS
          allocating space from Linux's available memory. Otherwise, leave
          this set to zero. Most people will want to leave this as zero.
 
          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"
-       depends on MTD
+config MTD_BLOCK2MTD
+       tristate "MTD using block device"
+       depends on MTD && BLOCK

        help
          This driver allows a block device to appear as an MTD. It would
          generally be used in the following cases:
        help
          This driver allows a block device to appear as an MTD. It would
          generally be used in the following cases:


@@ -141,15 +146,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).
 
          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
 comment "Disk-On-Chip Device Drivers"
 
 config MTD_DOC2000


@@ -218,7 +214,6 @@ config MTD_DOC2001PLUS
 config MTD_DOCPROBE
        tristate
        select MTD_DOCECC
 config MTD_DOCPROBE
        tristate
        select MTD_DOCECC

-       select OBSOLETE_INTERMODULE

 
 config MTD_DOCECC
        tristate
 
 config MTD_DOCECC
        tristate