IB/MAD: Integrate ib_mad module into ib_core module

[platform/kernel/linux-rpi.git] / drivers / infiniband / core / Makefile

diff --git a/drivers/infiniband/core/Makefile b/drivers/infiniband/core/Makefile
index 209838d..cc0a604 100644 (file)
--- a/drivers/infiniband/core/Makefile
+++ b/drivers/infiniband/core/Makefile
@@ -1,7 +1,7 @@
 infiniband-$(CONFIG_INFINIBAND_ADDR_TRANS)     := rdma_cm.o
 user_access-$(CONFIG_INFINIBAND_ADDR_TRANS)    := rdma_ucm.o
 
-obj-$(CONFIG_INFINIBAND) +=            ib_core.o ib_mad.o ib_sa.o \
+obj-$(CONFIG_INFINIBAND) +=            ib_core.o ib_sa.o \
                                        ib_cm.o iw_cm.o \
                                        $(infiniband-y)
 obj-$(CONFIG_INFINIBAND_USER_MAD) +=   ib_umad.o
@@ -10,12 +10,11 @@ obj-$(CONFIG_INFINIBAND_USER_ACCESS) +=     ib_uverbs.o ib_ucm.o \
 
 ib_core-y :=                   packer.o ud_header.o verbs.o cq.o rw.o sysfs.o \
                                device.o fmr_pool.o cache.o netlink.o \
-                               roce_gid_mgmt.o mr_pool.o addr.o
+                               roce_gid_mgmt.o mr_pool.o addr.o \
+                               mad.o smi.o agent.o mad_rmpp.o
 ib_core-$(CONFIG_INFINIBAND_USER_MEM) += umem.o
 ib_core-$(CONFIG_INFINIBAND_ON_DEMAND_PAGING) += umem_odp.o umem_rbtree.o
 
-ib_mad-y :=                    mad.o smi.o agent.o mad_rmpp.o
-
 ib_sa-y :=                     sa_query.o multicast.o
 
 ib_cm-y :=                     cm.o