git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.31' of git://fieldses.org/git/linux-nfsd
[safe/jmp/linux-2.6]
/
fs
/
Kconfig
diff --git
a/fs/Kconfig
b/fs/Kconfig
index
d78e950
..
a97263b
100644
(file)
--- a/
fs/Kconfig
+++ b/
fs/Kconfig
@@
-236,10
+236,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