Merge branch 'topic/timestamp' into for-next

[linux-2.6-block.git] / fs / ext2 / Kconfig

diff --git a/fs/ext2/Kconfig b/fs/ext2/Kconfig
index 14a6780fd034bfc1db2cf782218ce1c0b349059e..c634874e12d969fbd0b00ad8da745553168876e6 100644 (file)
--- a/fs/ext2/Kconfig
+++ b/fs/ext2/Kconfig
@@ -42,14 +42,3 @@ config EXT2_FS_SECURITY
 
          If you are not using a security module that requires using
          extended attributes for file security labels, say N.
-
-config EXT2_FS_XIP
-       bool "Ext2 execute in place support"
-       depends on EXT2_FS && MMU
-       help
-         Execute in place can be used on memory-backed block devices. If you
-         enable this option, you can select to mount block devices which are
-         capable of this feature without using the page cache.
-
-         If you do not use a block device that is capable of using this,
-         or if unsure, say N.