Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6

[deliverable/linux.git] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index 3d185308ec883bd0c06be0d151385c65e15b3353..65781de44fc0e04998d3daa2bee8b51e215d9844 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -50,6 +50,7 @@ endif # BLOCK
 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