Merge branch 'x86/fpu' into x86/urgent

[linux-2.6] / fs / dlm / Kconfig

diff --git a/fs/dlm/Kconfig b/fs/dlm/Kconfig
index 6fa7b0d..2dbb422 100644 (file)
--- a/fs/dlm/Kconfig
+++ b/fs/dlm/Kconfig
@@ -1,38 +1,17 @@
-menu "Distributed Lock Manager"
-       depends on EXPERIMENTAL && INET
-
-config DLM
+menuconfig DLM
        tristate "Distributed Lock Manager (DLM)"
+       depends on EXPERIMENTAL && INET
        depends on SYSFS && (IPV6 || IPV6=n)
        select CONFIGFS_FS
-       select IP_SCTP if DLM_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
+       select IP_SCTP
        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
+       A general purpose distributed lock manager for kernel or userspace
+       applications.
 
 config DLM_DEBUG
        bool "DLM debugging"
        depends on DLM
        help
-         Under the debugfs mount point, the name of each lockspace will
-         appear as a file in the "dlm" directory.  The output is the
-         list of resource and locks the local node knows about.
-
-endmenu
+       Under the debugfs mount point, the name of each lockspace will
+       appear as a file in the "dlm" directory.  The output is the
+       list of resource and locks the local node knows about.