Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6

1 files changed, 9 insertions, 17 deletions

diff --git a/fs/Kconfig b/fs/Kconfig
index aae0686a15fb..f93fd41b025d 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -1039,26 +1039,18 @@ config JFFS2_FS_DEBUG
           If reporting bugs, please try to have available a full dump of the
           messages at debug level 1 while the misbehaviour was occurring.
 
-config JFFS2_FS_NAND
-        bool "JFFS2 support for NAND flash"
+config JFFS2_FS_WRITEBUFFER
+        bool "JFFS2 write-buffering support"
         depends on JFFS2_FS
-        default n
+        default y
         help
-          This enables the support for NAND flash in JFFS2. NAND is a newer
-          type of flash chip design than the traditional NOR flash, with
-          higher density but a handful of characteristics which make it more
-          interesting for the file system to use.
+          This enables the write-buffering support in JFFS2.
 
-          Say 'N' unless you have NAND flash.
-
-config JFFS2_FS_NOR_ECC
-        bool "JFFS2 support for ECC'd NOR flash (EXPERIMENTAL)"
-        depends on JFFS2_FS && EXPERIMENTAL
-        default n
-        help
-          This enables the experimental support for NOR flash with transparent
-          ECC for JFFS2. This type of flash chip is not common, however it is
-          available from ST Microelectronics.
+          This functionality is required to support JFFS2 on the following
+          types of flash devices:
+            - NAND flash
+            - NOR flash with transparent ECC
+            - DataFlash
 
 config JFFS2_COMPRESSION_OPTIONS
         bool "Advanced compression options for JFFS2"