diff --git a/[refs] b/[refs]
index c4a73d439a03..fb4a8d8a12a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12214cb78147d42da28bc0d1b2917584e0a8efcd
+refs/heads/master: 686665619e4424b4f80c3a49e3e1229f27ea565c
diff --git a/trunk/fs/nfsd/Kconfig b/trunk/fs/nfsd/Kconfig
index 44d7d04dab95..503b9da159a3 100644
--- a/trunk/fs/nfsd/Kconfig
+++ b/trunk/fs/nfsd/Kconfig
@@ -1,6 +1,7 @@
 config NFSD
 	tristate "NFS server support"
 	depends on INET
+	depends on FILE_LOCKING
 	select LOCKD
 	select SUNRPC
 	select EXPORTFS