From: Steven Whitehouse Date: Tue, 12 Dec 2006 10:16:25 +0000 (+0000) Subject: [GFS2] Fix Kconfig X-Git-Tag: v2.6.20-rc2~74^2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1003f06953472ecc34f12d9867670f475a8c1af6;p=linux-2.6-omap-h63xx.git [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 Cc: Aleksandr Koltsoff Cc: Toralf Förster Cc: Randy Dunlap Cc: Adrian Bunk Cc: Chris Zubrzycki Cc: Patrick Caulfield --- diff --git a/fs/gfs2/Kconfig b/fs/gfs2/Kconfig index c0791cbacad..6a2ffa2db14 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