diff options
| author | Mark Bloch <markb@mellanox.com> | 2016-05-19 10:12:33 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2016-05-24 14:42:36 -0400 |
| commit | c2e49c92326f9baaa490492c48bea5a7f49d3244 (patch) | |
| tree | 1312cb0b8d02ff2e1ac9965f298ca8886f5d4b82 /drivers/infiniband/core/Makefile | |
| parent | 4c2cb4220431cbf92233dc12733ee8962abb9081 (diff) | |
IB/SA: Integrate ib_sa module into ib_core module
Consolidate ib_sa into ib_core, this commit eliminates
ib_sa.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 | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/infiniband/core/Makefile b/drivers/infiniband/core/Makefile index cc0a6042ccf4..edaae9f9853c 100644 --- a/drivers/infiniband/core/Makefile +++ b/drivers/infiniband/core/Makefile | |||
| @@ -1,8 +1,7 @@ | |||
| 1 | infiniband-$(CONFIG_INFINIBAND_ADDR_TRANS) := rdma_cm.o | 1 | infiniband-$(CONFIG_INFINIBAND_ADDR_TRANS) := rdma_cm.o |
| 2 | user_access-$(CONFIG_INFINIBAND_ADDR_TRANS) := rdma_ucm.o | 2 | user_access-$(CONFIG_INFINIBAND_ADDR_TRANS) := rdma_ucm.o |
| 3 | 3 | ||
| 4 | obj-$(CONFIG_INFINIBAND) += ib_core.o ib_sa.o \ | 4 | obj-$(CONFIG_INFINIBAND) += ib_core.o ib_cm.o iw_cm.o \ |
| 5 | ib_cm.o iw_cm.o \ | ||
| 6 | $(infiniband-y) | 5 | $(infiniband-y) |
| 7 | obj-$(CONFIG_INFINIBAND_USER_MAD) += ib_umad.o | 6 | obj-$(CONFIG_INFINIBAND_USER_MAD) += ib_umad.o |
| 8 | obj-$(CONFIG_INFINIBAND_USER_ACCESS) += ib_uverbs.o ib_ucm.o \ | 7 | obj-$(CONFIG_INFINIBAND_USER_ACCESS) += ib_uverbs.o ib_ucm.o \ |
| @@ -10,13 +9,11 @@ obj-$(CONFIG_INFINIBAND_USER_ACCESS) += ib_uverbs.o ib_ucm.o \ | |||
| 10 | 9 | ||
| 11 | ib_core-y := packer.o ud_header.o verbs.o cq.o rw.o sysfs.o \ | 10 | ib_core-y := packer.o ud_header.o verbs.o cq.o rw.o sysfs.o \ |
| 12 | device.o fmr_pool.o cache.o netlink.o \ | 11 | device.o fmr_pool.o cache.o netlink.o \ |
| 13 | roce_gid_mgmt.o mr_pool.o addr.o \ | 12 | roce_gid_mgmt.o mr_pool.o addr.o sa_query.o \ |
| 14 | mad.o smi.o agent.o mad_rmpp.o | 13 | multicast.o mad.o smi.o agent.o mad_rmpp.o |
| 15 | ib_core-$(CONFIG_INFINIBAND_USER_MEM) += umem.o | 14 | ib_core-$(CONFIG_INFINIBAND_USER_MEM) += umem.o |
| 16 | ib_core-$(CONFIG_INFINIBAND_ON_DEMAND_PAGING) += umem_odp.o umem_rbtree.o | 15 | ib_core-$(CONFIG_INFINIBAND_ON_DEMAND_PAGING) += umem_odp.o umem_rbtree.o |
| 17 | 16 | ||
| 18 | ib_sa-y := sa_query.o multicast.o | ||
| 19 | |||
| 20 | ib_cm-y := cm.o | 17 | ib_cm-y := cm.o |
| 21 | 18 | ||
| 22 | iw_cm-y := iwcm.o iwpm_util.o iwpm_msg.o | 19 | iw_cm-y := iwcm.o iwpm_util.o iwpm_msg.o |