Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[sfrench/cifs-2.6.git] / fs / dlm / Kconfig

diff --git a/fs/dlm/Kconfig b/fs/dlm/Kconfig
index 81b2c6465eeb26dd21f23746209162eee8169b22..54bcc00ec8df7daadc6cb466f4a5279bf14e1df6 100644 (file)
--- a/fs/dlm/Kconfig
+++ b/fs/dlm/Kconfig
@@ -1,10 +1,11 @@
 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
+       depends on SYSFS && (IPV6 || IPV6=n)
        select CONFIGFS_FS
+       select IP_SCTP
        help
        A general purpose distributed lock manager for kernel or userspace
        applications.