diff --git a/[refs] b/[refs]
index aa3bcd63cc59..7ebebdd10614 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e96f59f9b20373014abd5e30fba4805c5d4f53f
+refs/heads/master: 7e18c02be7c83a8cfd1319f0117f63509c20aa8e
diff --git a/trunk/fs/gfs2/locking/dlm/Makefile b/trunk/fs/gfs2/locking/dlm/Makefile
index a9733ff80371..89b93b6b45cf 100644
--- a/trunk/fs/gfs2/locking/dlm/Makefile
+++ b/trunk/fs/gfs2/locking/dlm/Makefile
@@ -1,3 +1,3 @@
-obj-$(CONFIG_GFS2_FS) += lock_dlm.o
+obj-$(CONFIG_GFS2_FS_LOCKING_DLM) += lock_dlm.o
 lock_dlm-y := lock.o main.o mount.o sysfs.o thread.o plock.o
 
diff --git a/trunk/fs/gfs2/locking/nolock/Makefile b/trunk/fs/gfs2/locking/nolock/Makefile
index cdadf956c831..35e9730bc3a8 100644
--- a/trunk/fs/gfs2/locking/nolock/Makefile
+++ b/trunk/fs/gfs2/locking/nolock/Makefile
@@ -1,3 +1,3 @@
-obj-$(CONFIG_GFS2_FS) += lock_nolock.o
+obj-$(CONFIG_GFS2_FS_LOCKING_NOLOCK) += lock_nolock.o
 lock_nolock-y := main.o