diff --git a/[refs] b/[refs]
index 73d8ced889fd..f340eae00d6e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 409753bf6da4a2db038027471abaf324e063db2f
+refs/heads/master: 93b06edb5127315473d87e075b2b1d1acf74659c
diff --git a/trunk/fs/ocfs2/dlm/Makefile b/trunk/fs/ocfs2/dlm/Makefile
index ce3f7c29d270..190361375700 100644
--- a/trunk/fs/ocfs2/dlm/Makefile
+++ b/trunk/fs/ocfs2/dlm/Makefile
@@ -1,6 +1,6 @@
 EXTRA_CFLAGS += -Ifs/ocfs2
 
-obj-$(CONFIG_OCFS2_FS) += ocfs2_dlm.o ocfs2_dlmfs.o
+obj-$(CONFIG_OCFS2_FS_O2CB) += ocfs2_dlm.o ocfs2_dlmfs.o
 
 ocfs2_dlm-objs := dlmdomain.o dlmdebug.o dlmthread.o dlmrecovery.o \
 	dlmmaster.o dlmast.o dlmconvert.o dlmlock.o dlmunlock.o dlmver.o