summaryrefslogtreecommitdiff
path: root/fs/ext2/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-03-13 16:20:46 +0300
committerIngo Molnar <mingo@kernel.org>2015-03-13 16:21:04 +0300
commit56544d29c3a0e383c0d819fefc9570b2803db193 (patch)
tree4366fc0ba3f5115b8c1c9d171fa245d86e5415d0 /fs/ext2/Kconfig
parent9261dc1de11e158a5f6b4b92c8bf1ef4a02dbf0d (diff)
parent9eccca0843205f87c00404b663188b88eb248051 (diff)
downloadlinux-56544d29c3a0e383c0d819fefc9570b2803db193.tar.xz
Merge tag 'v4.0-rc3' into x86/build, to refresh an older tree before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/ext2/Kconfig')
-rw-r--r--fs/ext2/Kconfig11
1 files changed, 0 insertions, 11 deletions
diff --git a/fs/ext2/Kconfig b/fs/ext2/Kconfig
index 14a6780fd034..c634874e12d9 100644
--- 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.