---

yaml --- r: 153684 b: refs/heads/master c: dd4dc82 h: refs/heads/master v: v3
git-mirror · May 13, 2009 · 38eccb5 · 38eccb5
1 parent 3233db8
commit 38eccb5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02cb2858dbfe216bd4a91c4afb4e259ef3b9e151
+refs/heads/master: dd4dc82d4c129babca9b48b219cff0add5ff4132
diff --git a/trunk/fs/Kconfig b/trunk/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/trunk/fs/nfs/Kconfig b/trunk/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