Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[mv-sheeva.git] / fs / ext4 / Kconfig

diff --git a/fs/ext4/Kconfig b/fs/ext4/Kconfig
index d5c0ea2e8f2da53412fae66e6b758cf8c0e6850a..9f2d45d75b1a70084e5f153c94d49a2b5f863321 100644 (file)
--- a/fs/ext4/Kconfig
+++ b/fs/ext4/Kconfig
@@ -26,20 +26,6 @@ config EXT4_FS
 
          If unsure, say N.
 
-config EXT4DEV_COMPAT
-       bool "Enable ext4dev compatibility"
-       depends on EXT4_FS
-       help
-         Starting with 2.6.28, the name of the ext4 filesystem was
-         renamed from ext4dev to ext4.  Unfortunately there are some
-         legacy userspace programs (such as klibc's fstype) have
-         "ext4dev" hardcoded.
-
-         To enable backwards compatibility so that systems that are
-         still expecting to mount ext4 filesystems using ext4dev,
-         choose Y here.   This feature will go away by 2.6.31, so
-         please arrange to get your userspace programs fixed!
-
 config EXT4_FS_XATTR
        bool "Ext4 extended attributes"
        depends on EXT4_FS