summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Szepe <szepe@pinerecords.com>2009-06-17 02:33:56 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-17 06:47:52 +0400
commit69050eee8e08a6234f29fe71a56f8c7c7d4d7186 (patch)
tree1f2b25ff34c8fa04df2a3ac70a5cfc5b145f9f4e
parent55e331cf7ebe20665253770589cd9eb06048bf25 (diff)
downloadlinux-69050eee8e08a6234f29fe71a56f8c7c7d4d7186.tar.xz
CONFIG_FILE_LOCKING should not depend on CONFIG_BLOCK
CONFIG_FILE_LOCKING should not depend on CONFIG_BLOCK. This makes it possible to run complete systems out of a CONFIG_BLOCK=n initramfs on current kernels again (this last worked on 2.6.27.*). Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--fs/Kconfig14
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/Kconfig b/fs/Kconfig
index 525da2e8f73b..4044f163035f 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -39,6 +39,13 @@ config FS_POSIX_ACL
bool
default n
+source "fs/xfs/Kconfig"
+source "fs/gfs2/Kconfig"
+source "fs/ocfs2/Kconfig"
+source "fs/btrfs/Kconfig"
+
+endif # BLOCK
+
config FILE_LOCKING
bool "Enable POSIX file locking API" if EMBEDDED
default y
@@ -47,13 +54,6 @@ config FILE_LOCKING
for filesystems like NFS and for the flock() system
call. Disabling this option saves about 11k.
-source "fs/xfs/Kconfig"
-source "fs/gfs2/Kconfig"
-source "fs/ocfs2/Kconfig"
-source "fs/btrfs/Kconfig"
-
-endif # BLOCK
-
source "fs/notify/Kconfig"
source "fs/quota/Kconfig"