summaryrefslogtreecommitdiff
path: root/fs/dlm/Kconfig
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor@insightbb.com>2006-11-05 06:42:39 +0300
committerDmitry Torokhov <dtor@insightbb.com>2006-11-05 06:42:39 +0300
commit752c58a471c108d64da1676b2925dfbd83eb177e (patch)
treefbffa0d7c54cd812950dffc16d642c9d449f4faf /fs/dlm/Kconfig
parente52b29c2a637f6854d71a45646d7283d984a6dad (diff)
parent10b1fbdb0a0ca91847a534ad26d0bc250c25b74f (diff)
downloadlinux-752c58a471c108d64da1676b2925dfbd83eb177e.tar.xz
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/dlm/Kconfig')
-rw-r--r--fs/dlm/Kconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/dlm/Kconfig b/fs/dlm/Kconfig
index 490f85b3fa59..81b2c6465eeb 100644
--- a/fs/dlm/Kconfig
+++ b/fs/dlm/Kconfig
@@ -1,10 +1,9 @@
menu "Distributed Lock Manager"
- depends on INET && EXPERIMENTAL
+ depends on INET && IP_SCTP && EXPERIMENTAL
config DLM
tristate "Distributed Lock Manager (DLM)"
depends on IPV6 || IPV6=n
- depends on IP_SCTP
select CONFIGFS_FS
help
A general purpose distributed lock manager for kernel or userspace