aboutsummaryrefslogtreecommitdiffstats
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"
226 226
227config LOCKD 227config LOCKD
228 tristate 228 tristate
229 depends on FILE_LOCKING
229 230
230config LOCKD_V4 231config LOCKD_V4
231 bool 232 bool
232 depends on NFSD_V3 || NFS_V3 233 depends on NFSD_V3 || NFS_V3
234 depends on FILE_LOCKING
233 default y 235 default y
234 236
235config EXPORTFS 237config 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 @@
1config NFS_FS 1config NFS_FS
2 tristate "NFS client support" 2 tristate "NFS client support"
3 depends on INET 3 depends on INET && FILE_LOCKING
4 select LOCKD 4 select LOCKD
5 select SUNRPC 5 select SUNRPC
6 select NFS_ACL_SUPPORT if NFS_V3_ACL 6 select NFS_ACL_SUPPORT if NFS_V3_ACL