diff --git a/[refs] b/[refs]
index 0b07fb0cf56b..de9d57a0882f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29b7998d887529eca1ef43c8ca7b278448dc983c
+refs/heads/master: a8f2d64728d8b706392fc1cb0f2fd6852a5e27ae
diff --git a/trunk/fs/gfs2/Makefile b/trunk/fs/gfs2/Makefile
index b1bac4f199db..974c76d0c6fc 100644
--- a/trunk/fs/gfs2/Makefile
+++ b/trunk/fs/gfs2/Makefile
@@ -39,6 +39,6 @@ gfs2-y := \
 	unlinked.o \
 	util.o
 
-obj-$(CONFIG_GFS2_LOCKING_NOLOCK) += locking/nolock/
-obj-$(CONFIG_GFS2_LOCKING_DLM) += locking/dlm/
+obj-$(CONFIG_GFS2_FS_LOCKING_NOLOCK) += locking/nolock/
+obj-$(CONFIG_GFS2_FS_LOCKING_DLM) += locking/dlm/