diff --git a/fs/gfs2/locking/dlm/Makefile b/fs/gfs2/locking/dlm/Makefile
index a9733ff80371..89b93b6b45cf 100644
--- a/fs/gfs2/locking/dlm/Makefile
+++ b/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/fs/gfs2/locking/nolock/Makefile b/fs/gfs2/locking/nolock/Makefile
index cdadf956c831..35e9730bc3a8 100644
--- a/fs/gfs2/locking/nolock/Makefile
+++ b/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