diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 08:41:41 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 13:07:53 -0400 |
| commit | 816724e65c72a90a44fbad0ef0b59b186c85fa90 (patch) | |
| tree | 421fa29aedff988e392f92780637553e275d37a0 /fs/Kconfig | |
| parent | 70ac4385a13f78bc478f26d317511893741b05bd (diff) | |
| parent | d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
fs/nfs/inode.c
fs/super.c
Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'
Diffstat (limited to 'fs/Kconfig')
| -rw-r--r-- | fs/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/Kconfig b/fs/Kconfig index 20f9b557732d..2aa4624cc018 100644 --- a/fs/Kconfig +++ b/fs/Kconfig | |||
| @@ -53,7 +53,7 @@ config EXT2_FS_SECURITY | |||
| 53 | 53 | ||
| 54 | config EXT2_FS_XIP | 54 | config EXT2_FS_XIP |
| 55 | bool "Ext2 execute in place support" | 55 | bool "Ext2 execute in place support" |
| 56 | depends on EXT2_FS | 56 | depends on EXT2_FS && MMU |
| 57 | help | 57 | help |
| 58 | Execute in place can be used on memory-backed block devices. If you | 58 | Execute in place can be used on memory-backed block devices. If you |
| 59 | enable this option, you can select to mount block devices which are | 59 | enable this option, you can select to mount block devices which are |