From: Patrick Caulfield <pcaulfie@redhat.com>
Date: Wed, 15 Nov 2006 17:29:24 +0000 (-0500)
Subject: [DLM] Fix DLM config
X-Git-Tag: v2.6.20-rc1~145^2^2~5^2~27
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b98c95af01c10827e3443157651eb469071391a3;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/fs/dlm/Kconfig b/fs/dlm/Kconfig
index c5985b883b2..b5654a284fe 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.