Merge branch 'master' into upstream

[~andy/linux] / fs / nfsd / Kconfig

diff --git a/fs/nfsd/Kconfig b/fs/nfsd/Kconfig
index 44d7d04dab95db965e50c8e86e58567fca2bb351..503b9da159a3d3def44ca3cb5d752d1020eb1e50 100644 (file)
--- a/fs/nfsd/Kconfig
+++ b/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