1 files changed, 2 insertions, 2 deletions
diff --git a/fs/gfs2/Makefile b/fs/gfs2/Makefile
index c1b4ec6a9650..a851ea4bdf70 100644
--- a/fs/gfs2/Makefile
+++ b/fs/gfs2/Makefile
@@ -1,9 +1,9 @@
 obj-$(CONFIG_GFS2_FS) += gfs2.o
 gfs2-y := acl.o bmap.o dir.o eaops.o eattr.o glock.o \
-        glops.o inode.o log.o lops.o locking.o main.o meta_io.o \
+        glops.o inode.o log.o lops.o main.o meta_io.o \
        mount.o ops_address.o ops_dentry.o ops_export.o ops_file.o \
        ops_fstype.o ops_inode.o ops_super.o quota.o \
        recovery.o rgrp.o super.o sys.o trans.o util.o
-obj-$(CONFIG_GFS2_FS_LOCKING_DLM) += locking/dlm/
+gfs2-$(CONFIG_GFS2_FS_LOCKING_DLM) += lock_dlm.o

diff --git a/fs/gfs2/Makefile b/fs/gfs2/Makefile index c1b4ec6a9650..a851ea4bdf70 100644 --- a/fs/gfs2/Makefile +++ b/fs/gfs2/Makefile
@@ -1,9 +1,9 @@
1	obj-$(CONFIG_GFS2_FS) += gfs2.o	1	obj-$(CONFIG_GFS2_FS) += gfs2.o
2	gfs2-y := acl.o bmap.o dir.o eaops.o eattr.o glock.o \	2	gfs2-y := acl.o bmap.o dir.o eaops.o eattr.o glock.o \
3	glops.o inode.o log.o lops.o locking.o main.o meta_io.o \	3	glops.o inode.o log.o lops.o main.o meta_io.o \
4	mount.o ops_address.o ops_dentry.o ops_export.o ops_file.o \	4	mount.o ops_address.o ops_dentry.o ops_export.o ops_file.o \
5	ops_fstype.o ops_inode.o ops_super.o quota.o \	5	ops_fstype.o ops_inode.o ops_super.o quota.o \
6	recovery.o rgrp.o super.o sys.o trans.o util.o	6	recovery.o rgrp.o super.o sys.o trans.o util.o
7		7
8	obj-$(CONFIG_GFS2_FS_LOCKING_DLM) += locking/dlm/	8	gfs2-$(CONFIG_GFS2_FS_LOCKING_DLM) += lock_dlm.o
9		9