Pull thermal into release branch

[karo-tx-linux.git] / fs / dlm / Kconfig

diff --git a/fs/dlm/Kconfig b/fs/dlm/Kconfig
index c5985b883b2c4f830fd27d1b05aef21e21e8356c..69a94690e493504259fe0d4c04bdd152c56e71ee 100644 (file)
--- a/fs/dlm/Kconfig
+++ b/fs/dlm/Kconfig
@@ -1,31 +1,15 @@
 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
        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