Merge branches 'release' and 'ppc-workaround' into release
[cascardo/linux.git] / fs / dlm / Makefile
index 1832e02..d248e60 100644 (file)
@@ -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