diff --git a/[refs] b/[refs]
index a7f97d46aec4..bdc72e3fc78e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af21ca8ed50f01c5278c5ded6dad6f05e8a5d2e4
+refs/heads/master: 75f96ce6e754eee30d9ec788ad91c6ec21d0a46b
diff --git a/trunk/fs/gfs2/Kconfig b/trunk/fs/gfs2/Kconfig
index eb08c9e43c2a..5a376ab81feb 100644
--- a/trunk/fs/gfs2/Kconfig
+++ b/trunk/fs/gfs2/Kconfig
@@ -26,7 +26,7 @@ config GFS2_FS
 config GFS2_FS_LOCKING_DLM
 	bool "GFS2 DLM locking"
 	depends on (GFS2_FS!=n) && NET && INET && (IPV6 || IPV6=n) && \
-		HOTPLUG && DLM && CONFIGFS_FS && SYSFS
+		HOTPLUG && CONFIGFS_FS && SYSFS && (DLM=y || DLM=GFS2_FS)
 	help
 	  Multiple node locking module for GFS2