Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[powerpc.git] / fs / dlm / Makefile

diff --git a/fs/dlm/Makefile b/fs/dlm/Makefile
index 1e6232e..6538894 100644 (file)
--- a/fs/dlm/Makefile
+++ b/fs/dlm/Makefile
@@ -1,12 +1,9 @@
 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 \
@@ -15,7 +12,10 @@ dlm-y :=                     ast.o \
                                recover.o \
                                recoverd.o \
                                requestqueue.o \
+                               user.o \
                                util.o
 dlm-$(CONFIG_DLM_DEBUG) +=     debug_fs.o
 
-dlm_device-y :=                        device.o
+dlm-$(CONFIG_DLM_TCP)   += lowcomms-tcp.o
+
+dlm-$(CONFIG_DLM_SCTP)  += lowcomms-sctp.o
\ No newline at end of file