Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

[mv-sheeva.git] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index d78e950402c1e2a4c91bc5ae58dc8011edc885bb..a97263be6a91d4927bef9dd8c3e834c7c251a472 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -236,10 +236,12 @@ source "fs/nfsd/Kconfig"
 
 config LOCKD
        tristate
+       depends on FILE_LOCKING
 
 config LOCKD_V4
        bool
        depends on NFSD_V3 || NFS_V3
+       depends on FILE_LOCKING
        default y
 
 config EXPORTFS