fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/drivers/mtd/chips/Kconfig b/drivers/mtd/chips/Kconfig
index 205bb70..72e6d73 100644 (file)
--- a/drivers/mtd/chips/Kconfig
+++ b/drivers/mtd/chips/Kconfig
@@ -25,13 +25,11 @@ config MTD_JEDECPROBE
          compatible with the Common Flash Interface, but will use the common
          CFI-targetted flash drivers for any chips which are identified which
          are in fact compatible in all but the probe method. This actually
-         covers most AMD/Fujitsu-compatible chips, and will shortly cover also
-         non-CFI Intel chips (that code is in MTD CVS and should shortly be sent
-         for inclusion in Linus' tree)
+         covers most AMD/Fujitsu-compatible chips and also non-CFI
+         Intel chips.
 
 config MTD_GEN_PROBE
        tristate
-       select OBSOLETE_INTERMODULE
 
 config MTD_CFI_ADV_OPTIONS
        bool "Flash chip driver advanced configuration options"
@@ -201,27 +199,6 @@ config MTD_CFI_AMDSTD
          provides support for one of those command sets, used on chips
          including the AMD Am29LV320.
 
-config MTD_CFI_AMDSTD_RETRY
-       int "Retry failed commands (erase/program)"
-       depends on MTD_CFI_AMDSTD
-       default "0"
-       help
-         Some chips, when attached to a shared bus, don't properly filter
-         bus traffic that is destined to other devices.  This broken
-         behavior causes erase and program sequences to be aborted when
-         the sequences are mixed with traffic for other devices.
-
-         SST49LF040 (and related) chips are know to be broken.
-
-config MTD_CFI_AMDSTD_RETRY_MAX
-       int "Max retries of failed commands (erase/program)"
-       depends on MTD_CFI_AMDSTD_RETRY
-       default "0"
-       help
-         If you have an SST49LF040 (or related chip) then this value should
-         be set to at least 1.  This can also be adjusted at driver load
-         time with the retry_cmd_max module parameter.
-
 config MTD_CFI_STAA
        tristate "Support for ST (Advanced Architecture) flash chips"
        depends on MTD_GEN_PROBE
@@ -293,7 +270,7 @@ config MTD_JEDEC
        tristate "JEDEC device support"
        depends on MTD && MTD_OBSOLETE_CHIPS && BROKEN
        help
-         Enable older older JEDEC flash interface devices for self
+         Enable older JEDEC flash interface devices for self
          programming flash.  It is commonly used in older AMD chips.  It is
          only called JEDEC because the JEDEC association
          <http://www.jedec.org/> distributes the identification codes for the