diff options
| author | Tomas Szepe <szepe@pinerecords.com> | 2009-06-16 15:33:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-07-02 16:51:01 -0700 |
| commit | 4d794ad7062fe1c862db70ebb696aa0332a83dc0 (patch) | |
| tree | 7b07c44d5cb6736b728932232e6827422a3dda44 /fs | |
| parent | 5fbba42ae4b30f9eb2a4fd87d4599e3c4cde2137 (diff) | |
CONFIG_FILE_LOCKING should not depend on CONFIG_BLOCK
commit 69050eee8e08a6234f29fe71a56f8c7c7d4d7186 upstream.
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.*).
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/Kconfig | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/Kconfig b/fs/Kconfig index 9f7270f36b2a..ab3ccc1afd0a 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" |