summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-12-12 10:16:25 +0000
committerSteven Whitehouse <swhiteho@redhat.com>2006-12-15 12:51:51 -0500
commit1003f06953472ecc34f12d9867670f475a8c1af6 (patch)
tree49c512b471141d7c63a6941d02d1175ccb25dad6
parentc80e7c83d56866a735236b45441f024b589f9e88 (diff)
downloadlinux-1003f06953472ecc34f12d9867670f475a8c1af6.tar.bz2
[GFS2] Fix Kconfig
Here is a patch to fix up the Kconfig so that we don't land up with problems when people disable the NET subsystem. Thanks for all the hints and suggestions that people have sent me regarding this. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com> Cc: Aleksandr Koltsoff <czr@iki.fi> Cc: Toralf Förster <toralf.foerster@gmx.de> Cc: Randy Dunlap <randy.dunlap@oracle.com> Cc: Adrian Bunk <bunk@stusta.de> Cc: Chris Zubrzycki <chris@middle--earth.org> Cc: Patrick Caulfield <pcaulfie@redhat.com>
-rw-r--r--fs/gfs2/Kconfig4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/gfs2/Kconfig b/fs/gfs2/Kconfig
index c0791cbacad9..6a2ffa2db14f 100644
--- a/fs/gfs2/Kconfig
+++ b/fs/gfs2/Kconfig
@@ -34,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