Merge branch 'juju' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux13...

[linux-2.6] / drivers / infiniband / core / Makefile

diff --git a/drivers/infiniband/core/Makefile b/drivers/infiniband/core/Makefile
index 50fb1cd..cb1ab3e 100644 (file)
--- a/drivers/infiniband/core/Makefile
+++ b/drivers/infiniband/core/Makefile
@@ -9,10 +9,11 @@ obj-$(CONFIG_INFINIBAND_USER_ACCESS) +=       ib_uverbs.o ib_ucm.o \
 
 ib_core-y :=                   packer.o ud_header.o verbs.o sysfs.o \
                                device.o fmr_pool.o cache.o
+ib_core-$(CONFIG_INFINIBAND_USER_MEM) += umem.o
 
 ib_mad-y :=                    mad.o smi.o agent.o mad_rmpp.o
 
-ib_sa-y :=                     sa_query.o
+ib_sa-y :=                     sa_query.o multicast.o
 
 ib_cm-y :=                     cm.o
 
@@ -28,5 +29,4 @@ ib_umad-y :=                  user_mad.o
 
 ib_ucm-y :=                    ucm.o
 
-ib_uverbs-y :=                 uverbs_main.o uverbs_cmd.o uverbs_mem.o \
-                               uverbs_marshall.o
+ib_uverbs-y :=                 uverbs_main.o uverbs_cmd.o uverbs_marshall.o