projects
/
~shefty
/
rdma-dev.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux
[~shefty/rdma-dev.git]
/
fs
/
nfsd
/
Kconfig
diff --git
a/fs/nfsd/Kconfig
b/fs/nfsd/Kconfig
index 18b3e8975fe05c2364dd507d50b364b4c13b0dfd..31a78fce4732a0d473884425a0728073bf96668e 100644
(file)
--- a/
fs/nfsd/Kconfig
+++ b/
fs/nfsd/Kconfig
@@
-2,6
+2,7
@@
config NFSD
tristate "NFS server support"
depends on INET
depends on FILE_LOCKING
+ depends on BKL # fix as soon as lockd is done
select LOCKD
select SUNRPC
select EXPORTFS