diff options
| author | Doug Ledford <dledford@redhat.com> | 2017-10-18 13:07:13 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-10-18 13:07:13 -0400 |
| commit | 754137a769ac8f13cd6c0e1bc4fc2fa768d3da63 (patch) | |
| tree | 0a39eda714b8b0bb3522654fb326e499fbe552e7 /drivers/infiniband/hw/hns/Makefile | |
| parent | e980b44134c89afb65176e70aaf293d608002e83 (diff) | |
| parent | 4c532d6ce14bb3fb4e1cb2d29fafdd7d6bded51c (diff) | |
Merge branch 'for-next-early' into for-next
The early for-next branch was based on v4.14-rc2, while the shared pull
request I got from Mellanox used a v4.14-rc4 base. I'm making the
branch that was the shared Mellanox pull request the new for-next branch
and merging the early for-next branch into it.
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/hw/hns/Makefile')
| -rw-r--r-- | drivers/infiniband/hw/hns/Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/hns/Makefile b/drivers/infiniband/hw/hns/Makefile index 7e8ebd24dcae..ff426a625e13 100644 --- a/drivers/infiniband/hw/hns/Makefile +++ b/drivers/infiniband/hw/hns/Makefile @@ -2,7 +2,13 @@ # Makefile for the Hisilicon RoCE drivers. # +ccflags-y := -Idrivers/net/ethernet/hisilicon/hns3 + obj-$(CONFIG_INFINIBAND_HNS) += hns-roce.o hns-roce-objs := hns_roce_main.o hns_roce_cmd.o hns_roce_eq.o hns_roce_pd.o \ hns_roce_ah.o hns_roce_hem.o hns_roce_mr.o hns_roce_qp.o \ - hns_roce_cq.o hns_roce_alloc.o hns_roce_hw_v1.o + hns_roce_cq.o hns_roce_alloc.o +obj-$(CONFIG_INFINIBAND_HNS_HIP06) += hns-roce-hw-v1.o +hns-roce-hw-v1-objs := hns_roce_hw_v1.o +obj-$(CONFIG_INFINIBAND_HNS_HIP08) += hns-roce-hw-v2.o +hns-roce-hw-v2-objs := hns_roce_hw_v2.o |