From 805c60fc8b5ffe7be95fd22808f8ecaa42d44c32 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Tue, 12 Dec 2006 10:16:25 +0000
Subject: [PATCH] --- yaml --- r: 44853 b: refs/heads/master c:
 1003f06953472ecc34f12d9867670f475a8c1af6 h: refs/heads/master i:   44851:
 a43a9c393fcd213ef9d3f72ac2eb2cb632ece699 v: v3

---
 [refs]                | 2 +-
 trunk/fs/gfs2/Kconfig | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 016539b33448..69c28437f770 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c80e7c83d56866a735236b45441f024b589f9e88
+refs/heads/master: 1003f06953472ecc34f12d9867670f475a8c1af6
diff --git a/trunk/fs/gfs2/Kconfig b/trunk/fs/gfs2/Kconfig
index c0791cbacad9..6a2ffa2db14f 100644
--- a/trunk/fs/gfs2/Kconfig
+++ b/trunk/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