Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[pandora-kernel.git] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index 3d18530..b5e582b 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -47,9 +47,13 @@ source "fs/nilfs2/Kconfig"
 
 endif # BLOCK
 
+config EXPORTFS
+       tristate
+
 config FILE_LOCKING
        bool "Enable POSIX file locking API" if EMBEDDED
        default y
+       select BKL # while lockd still uses it.
        help
          This option enables standard file locking support, required
           for filesystems like NFS and for the flock() system
@@ -221,9 +225,6 @@ config LOCKD_V4
        depends on FILE_LOCKING
        default y
 
-config EXPORTFS
-       tristate
-
 config NFS_ACL_SUPPORT
        tristate
        select FS_POSIX_ACL