Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6] / fs / dlm / Makefile

diff --git a/fs/dlm/Makefile b/fs/dlm/Makefile
index 1e6232e7d8e5ca90b0e6e2586c3bdc8f914777ce..d248e60951bac0ce8d04b19f291e380814f3826c 100644 (file)
--- a/fs/dlm/Makefile
+++ b/fs/dlm/Makefile
@@ -1,21 +1,20 @@
 obj-$(CONFIG_DLM) +=           dlm.o
-obj-$(CONFIG_DLM_DEVICE) +=    dlm_device.o
-
 dlm-y :=                       ast.o \
                                config.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 \
-                               util.o
+                               user.o \
+                               util.o 
 dlm-$(CONFIG_DLM_DEBUG) +=     debug_fs.o
 
-dlm_device-y :=                        device.o