1 files changed, 10 insertions, 13 deletions

diff --git a/fs/Kconfig b/fs/Kconfig
index 7b1511d50b05..8cd2417a14db 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -12,9 +12,7 @@ config EXT2_FS
           Ext2 is a standard Linux file system for hard disks.
 
           To compile this file system support as a module, choose M here: the
-          module will be called ext2.  Be aware however that the file system
-          of your root partition (the one containing the directory /) cannot
-          be compiled as a module, and so this could be dangerous.
+          module will be called ext2.
 
           If unsure, say Y.
 
@@ -98,9 +96,7 @@ config EXT3_FS
           (available at <http://sourceforge.net/projects/e2fsprogs/>).
 
           To compile this file system support as a module, choose M here: the
-          module will be called ext3.  Be aware however that the file system
-          of your root partition (the one containing the directory /) cannot
-          be compiled as a module, and so this may be dangerous.
+          module will be called ext3.
 
 config EXT3_FS_XATTR
         bool "Ext3 extended attributes"
@@ -163,9 +159,7 @@ config EXT4DEV_FS
           features will be added to ext4dev gradually.
 
           To compile this file system support as a module, choose M here. The
-          module will be called ext4dev.  Be aware, however, that the filesystem
-          of your root partition (the one containing the directory /) cannot
-          be compiled as a module, and so this could be dangerous.
+          module will be called ext4dev.
 
           If unsure, say N.
 
@@ -972,7 +966,7 @@ config SYSFS
 
         Some system agents rely on the information in sysfs to operate.
         /sbin/hotplug uses device and object attributes in sysfs to assist in
-        delegating policy decisions, like persistantly naming devices.
+        delegating policy decisions, like persistently naming devices.
 
         sysfs is currently used by the block subsystem to mount the root
         partition.  If sysfs is disabled you must specify the boot device on
@@ -1008,7 +1002,7 @@ config TMPFS_POSIX_ACL
 
 config HUGETLBFS
         bool "HugeTLB file system support"
-        depends X86 || IA64 || PPC64 || SPARC64 || SUPERH || BROKEN
+        depends on X86 || IA64 || PPC64 || SPARC64 || SUPERH || BROKEN
         help
           hugetlbfs is a filesystem backing for HugeTLB pages, based on
           ramfs. For architectures that support it, say Y here and read
@@ -1145,7 +1139,7 @@ config BEFS_FS
         help
           The BeOS File System (BeFS) is the native file system of Be, Inc's
           BeOS. Notable features include support for arbitrary attributes
-          on files and directories, and database-like indeces on selected
+          on files and directories, and database-like indices on selected
           attributes. (Also note that this driver doesn't make those features
           available at this time). It is a 64 bit filesystem, so it supports
           extremely large volumes and files.
@@ -1204,13 +1198,16 @@ config EFS_FS
 
 config JFFS_FS
         tristate "Journalling Flash File System (JFFS) support"
-        depends on MTD && BLOCK
+        depends on MTD && BLOCK && BROKEN
         help
           JFFS is the Journalling Flash File System developed by Axis
           Communications in Sweden, aimed at providing a crash/powerdown-safe
           file system for disk-less embedded devices. Further information is
           available at (<http://developer.axis.com/software/jffs/>).
 
+          NOTE: This filesystem is deprecated and is scheduled for removal in
+          2.6.21.  See Documentation/feature-removal-schedule.txt
+
 config JFFS_FS_VERBOSE
         int "JFFS debugging verbosity (0 = quiet, 3 = noisy)"
         depends on JFFS_FS