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

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

diff --git a/fs/dlm/Kconfig b/fs/dlm/Kconfig
index b5654a284fef1283b1186d7e39dcc1e0b3426396..6fa7b0d5c04387b6ab7cf9b3f90f7dc21e21831a 100644 (file)
--- a/fs/dlm/Kconfig
+++ b/fs/dlm/Kconfig
@@ -3,21 +3,21 @@ menu "Distributed Lock Manager"
 
 config DLM
        tristate "Distributed Lock Manager (DLM)"
-       depends on IPV6 || IPV6=n
+       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.
+         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.
+         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"
@@ -31,8 +31,8 @@ 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.
+         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