Merge master.kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

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

diff --git a/fs/gfs2/Kconfig b/fs/gfs2/Kconfig
index 8c27de8b95682134fcda8c33f7f1e687a4e8e28f..6a2ffa2db14f55566db9b6f9d643218afa6d5b59 100644 (file)
--- a/fs/gfs2/Kconfig
+++ b/fs/gfs2/Kconfig
@@ -2,6 +2,7 @@ config GFS2_FS
        tristate "GFS2 file system support"
        depends on EXPERIMENTAL
        select FS_POSIX_ACL
+       select CRC32
        help
        A cluster filesystem.
 
@@ -33,7 +34,9 @@ config GFS2_FS_LOCKING_NOLOCK
 
 config GFS2_FS_LOCKING_DLM
        tristate "GFS2 DLM locking module"
-       depends on GFS2_FS
+       depends on GFS2_FS && NET && INET && (IPV6 || IPV6=n)
+       select IP_SCTP if DLM_SCTP
+       select CONFIGFS_FS
        select DLM
        help
        Multiple node locking module for GFS2