Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6] / fs / dlm / Kconfig

diff --git a/fs/dlm/Kconfig b/fs/dlm/Kconfig
index 09e78bf6e7a46310e2af3a1f6390f486f3fb7896..54bcc00ec8df7daadc6cb466f4a5279bf14e1df6 100644 (file)
--- a/fs/dlm/Kconfig
+++ b/fs/dlm/Kconfig
@@ -1,23 +1,15 @@
 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
+       depends on SYSFS && (IPV6 || IPV6=n)
        select CONFIGFS_FS
+       select IP_SCTP
        help
        A general purpose distributed lock manager for kernel or userspace
        applications.
 
-config DLM_DEVICE
-       tristate "DLM device for userspace access"
-       depends on DLM
-       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).
-
 config DLM_DEBUG
        bool "DLM debugging"
        depends on DLM