Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[sfrench/cifs-2.6.git] / drivers / mtd / chips / Kconfig

diff --git a/drivers/mtd/chips/Kconfig b/drivers/mtd/chips/Kconfig
index 205bb708333502153faacef488cb0fd9da96017c..0f6bb2e625d8487574bccba7f0c89140a1108d51 100644 (file)
--- a/drivers/mtd/chips/Kconfig
+++ b/drivers/mtd/chips/Kconfig
@@ -25,9 +25,8 @@ 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