summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorPatrick Caulfield <pcaulfie@redhat.com>2006-11-15 12:29:24 -0500
committerSteven Whitehouse <swhiteho@redhat.com>2006-11-30 10:35:41 -0500
commitb98c95af01c10827e3443157651eb469071391a3 (patch)
tree81e72ef5265cb2f20643a6250b94d3069bc9e789 /fs
parent6f90a8b1b87f97144911790390d56f695b59db9b (diff)
downloadlinux-b98c95af01c10827e3443157651eb469071391a3.tar.gz
linux-b98c95af01c10827e3443157651eb469071391a3.tar.bz2
linux-b98c95af01c10827e3443157651eb469071391a3.zip
[DLM] Fix DLM config
The attached patch fixes the DLM config so that it selects the chosen network transport. It should fix the bug where DLM can be left selected when NET gets unselected. This incorporates all the comments received about this patch. Cc: Adrian Bunk <bunk@stusta.de> Cc: Andrew Morton <akpm@osdl.org> Signed-Off-By: Patrick Caulfield <pcaulfie@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/dlm/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/dlm/Kconfig b/fs/dlm/Kconfig
index c5985b883b2c..b5654a284fef 100644
--- a/fs/dlm/Kconfig
+++ b/fs/dlm/Kconfig
@@ -1,10 +1,11 @@
menu "Distributed Lock Manager"
- depends on INET && IP_SCTP && EXPERIMENTAL
+ depends on EXPERIMENTAL && INET
config DLM
tristate "Distributed Lock Manager (DLM)"
depends on IPV6 || IPV6=n
select CONFIGFS_FS
+ select IP_SCTP if DLM_SCTP
help
A general purpose distributed lock manager for kernel or userspace
applications.