diff --git a/fs/Kconfig b/fs/Kconfig
index 9f7270f36b2af4e207b26ff52f9b98ad502d8c00..44ab328ceb2a03e08e2834145b85db951efeb705 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 e67f3ec0773681c17dcf906e0cddfbd12d9ea1bc..7dbb8f27b9d6c914fa9b5147372071abe61f53c8 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