projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...
[platform/kernel/linux-rpi.git]
/
fs
/
ocfs2
/
dlm
/
Makefile
diff --git
a/fs/ocfs2/dlm/Makefile
b/fs/ocfs2/dlm/Makefile
index
c8a044e
..
bd1aab1
100644
(file)
--- a/
fs/ocfs2/dlm/Makefile
+++ b/
fs/ocfs2/dlm/Makefile
@@
-3,5
+3,5
@@
ccflags-y := -Ifs/ocfs2
obj-$(CONFIG_OCFS2_FS_O2CB) += ocfs2_dlm.o
ocfs2_dlm-objs := dlmdomain.o dlmdebug.o dlmthread.o dlmrecovery.o \
- dlmmaster.o dlmast.o dlmconvert.o dlmlock.o dlmunlock.o
dlmver.o
+ dlmmaster.o dlmast.o dlmconvert.o dlmlock.o dlmunlock.o