git.openpandora.org
/
pandora-kernel.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/dtor/input
[pandora-kernel.git]
/
fs
/
dlm
/
Makefile
diff --git
a/fs/dlm/Makefile
b/fs/dlm/Makefile
index
1832e02
..
d248e60
100644
(file)
--- a/
fs/dlm/Makefile
+++ b/
fs/dlm/Makefile
@@
-4,16
+4,17
@@
dlm-y := ast.o \
dir.o \
lock.o \
lockspace.o \
- lowcomms.o \
main.o \
member.o \
memory.o \
midcomms.o \
+ netlink.o \
+ lowcomms.o \
rcom.o \
recover.o \
recoverd.o \
requestqueue.o \
user.o \
- util.o
+ util.o
dlm-$(CONFIG_DLM_DEBUG) += debug_fs.o