Pull platform-drivers into test branch

[linux-2.6-omap-h63xx.git] / fs / dlm / Kconfig

diff --git a/fs/dlm/Kconfig b/fs/dlm/Kconfig
index 09e78bf6e7a46310e2af3a1f6390f486f3fb7896..b5654a284fef1283b1186d7e39dcc1e0b3426396 100644 (file)
--- a/fs/dlm/Kconfig
+++ b/fs/dlm/Kconfig
@@ -1,22 +1,31 @@
 menu "Distributed Lock Manager"
-       depends on INET && EXPERIMENTAL
+       depends on EXPERIMENTAL && INET
 
 config DLM
        tristate "Distributed Lock Manager (DLM)"
        depends on IPV6 || IPV6=n
-       depends on IP_SCTP
        select CONFIGFS_FS
+       select IP_SCTP if DLM_SCTP
        help
        A general purpose distributed lock manager for kernel or userspace
        applications.
 
-config DLM_DEVICE
-       tristate "DLM device for userspace access"
+choice
+       prompt "Select DLM communications protocol"
        depends on DLM
+       default DLM_TCP
        help
-       This module creates a misc device through which the dlm lockspace
-       and locking functions become available to userspace applications
-       (usually through the libdlm library).
+       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"