diff options
| author | Mark Bloch <markb@mellanox.com> | 2016-05-19 17:12:32 +0300 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2016-05-24 14:40:13 -0400 |
| commit | 4c2cb4220431cbf92233dc12733ee8962abb9081 (patch) | |
| tree | 58f07d7b6a1f4013e1d992659f98d2ee12b73003 /drivers/infiniband/core/Makefile | |
| parent | e3f20f02864f6da1509c523bfa1e928619e59095 (diff) | |
| download | linux-stable-4c2cb4220431cbf92233dc12733ee8962abb9081.tar.gz linux-stable-4c2cb4220431cbf92233dc12733ee8962abb9081.tar.bz2 linux-stable-4c2cb4220431cbf92233dc12733ee8962abb9081.zip | |
IB/MAD: Integrate ib_mad module into ib_core module
Consolidate ib_mad into ib_core, this commit eliminates
ib_mad.ko and makes it part of ib_core.ko
Signed-off-by: Mark Bloch <markb@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/core/Makefile')
| -rw-r--r-- | drivers/infiniband/core/Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/infiniband/core/Makefile b/drivers/infiniband/core/Makefile index 209838d2114d..cc0a6042ccf4 100644 --- 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 |