From 2bf3d94ce25996b5b31843746b490f21a88668b1 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rdunlap@infradead.org>
Date: Tue, 14 May 2013 10:02:48 -0700
Subject: [PATCH] --- yaml --- r: 376191 b: refs/heads/master c:
 75f96ce6e754eee30d9ec788ad91c6ec21d0a46b h: refs/heads/master i:   376189:
 05ba47ac7db40eebe2db3bbfb619de12da33e1a2   376187:
 65220b314a180035cdbb3c6efb1350b5d31c1957   376183:
 03fbe3a3a0908775686355f9ecc6fe91dd49acb0   376175:
 05548c2c45f14f5f30e8b7fe24366120642dce74   376159:
 5b6086f6308cecc0872787ed9adc2002022c879e   376127:
 dc7a25ff08d447a0c91fcb47b9944d316c25d559   376063:
 d9a6e3b35fdb42a4bce5512d317995bf15468243 v: v3

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

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