X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fdlm%2FKconfig;h=54bcc00ec8df7daadc6cb466f4a5279bf14e1df6;hb=ed72df448250a6da72b65e7881eb63c5ded3475f;hp=b5654a284fef1283b1186d7e39dcc1e0b3426396;hpb=cece901481bafbf14de8cbd3a89ae869ea881055;p=linux-2.6

diff --git a/fs/dlm/Kconfig b/fs/dlm/Kconfig
index b5654a284f..54bcc00ec8 100644
--- a/fs/dlm/Kconfig
+++ b/fs/dlm/Kconfig
@@ -3,30 +3,13 @@ menu "Distributed Lock Manager"
 
 config DLM
 	tristate "Distributed Lock Manager (DLM)"
-	depends on IPV6 || IPV6=n
+	depends on SYSFS && (IPV6 || IPV6=n)
 	select CONFIGFS_FS
-	select IP_SCTP if DLM_SCTP
+	select IP_SCTP
 	help
 	A general purpose distributed lock manager for kernel or userspace
 	applications.
 
-choice
-	prompt "Select DLM communications protocol"
-	depends on DLM
-	default DLM_TCP
-	help
-	The DLM Can use TCP or SCTP for it's network communications.
-	SCTP supports multi-homed operations whereas TCP doesn't.
-	However, SCTP seems to have stability problems at the moment.
-
-config DLM_TCP
-	bool "TCP/IP"
-
-config DLM_SCTP
-	bool "SCTP"
-
-endchoice
-
 config DLM_DEBUG
 	bool "DLM debugging"
 	depends on DLM