summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/Kconfig2
-rw-r--r--fs/nfs/Kconfig2
2 files changed, 3 insertions, 1 deletions
diff --git a/fs/Kconfig b/fs/Kconfig
index 9f7270f36b2a..44ab328ceb2a 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -226,10 +226,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
diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig
index e67f3ec07736..7dbb8f27b9d6 100644
--- a/fs/nfs/Kconfig
+++ b/fs/nfs/Kconfig
@@ -1,6 +1,6 @@
config NFS_FS
tristate "NFS client support"
- depends on INET
+ depends on INET && FILE_LOCKING
select LOCKD
select SUNRPC
select NFS_ACL_SUPPORT if NFS_V3_ACL