Merge git://git.infradead.org/mtd-2.6

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

diff --git a/drivers/mtd/devices/Kconfig b/drivers/mtd/devices/Kconfig
index b4ea64dc9360ddc080878a25277de38cac64c6e6..9c613f06623cd4d1191eafb7e6d4adfb75736037 100644 (file)
--- a/drivers/mtd/devices/Kconfig
+++ b/drivers/mtd/devices/Kconfig
@@ -1,5 +1,4 @@
 # drivers/mtd/maps/Kconfig
-# $Id: Kconfig,v 1.18 2005/11/07 11:14:24 gleixner Exp $
 
 menu "Self-contained MTD device drivers"
        depends on MTD!=n
@@ -60,14 +59,6 @@ config MTD_DATAFLASH
          Sometimes DataFlash chips are packaged inside MMC-format
          cards; at this writing, the MMC stack won't handle those.
 
-config MTD_DATAFLASH26
-       tristate "AT91RM9200 DataFlash AT26xxx"
-       depends on MTD && ARCH_AT91RM9200 && AT91_SPI
-       help
-         This enables access to the DataFlash chip (AT26xxx) on an
-         AT91RM9200-based board.
-         If you have such a board and such a DataFlash, say 'Y'.
-
 config MTD_M25P80
        tristate "Support most SPI Flash chips (AT26DF, M25P, W25X, ...)"
        depends on SPI_MASTER && EXPERIMENTAL
@@ -85,6 +76,13 @@ config MTD_M25P80
          if you want to specify device partitioning or to use a device which
          doesn't support the JEDEC ID instruction.
 
+config M25PXX_USE_FAST_READ
+       bool "Use FAST_READ OPCode allowing SPI CLK <= 50MHz"
+       depends on MTD_M25P80
+       default y
+       help
+         This option enables FAST_READ access supported by ST M25Pxx.
+
 config MTD_SLRAM
        tristate "Uncached system RAM"
        help