diff options
| author |   Doug Ledford <dledford@redhat.com> | 2019-07-29 13:38:42 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2019-07-29 13:38:42 -0400 |
| commit | 525a2c651cdd08b19a4c04f63b87e460765220ac (patch) | |
| tree | ad65ead1b0a281be08e5c47e2a7eb911dd0d2a9b /drivers/infiniband/hw/hns/Makefile | |
| parent | IB/mlx5: Support per device q counters in switchdev mode (diff) | |
| parent | Do not dereference 'siw_crypto_shash' before checking (diff) | |
| download | linux-dev-525a2c651cdd08b19a4c04f63b87e460765220ac.tar.xz linux-dev-525a2c651cdd08b19a4c04f63b87e460765220ac.zip | |
Merge branch 'wip/dl-for-rc' into wip/dl-for-next
The fix for IB port statistics initialization ("IB/core: Fix querying
total rdma stats") is needed before we take a follow-on patch to
for-next.
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, 2 insertions, 6 deletions
diff --git a/drivers/infiniband/hw/hns/Makefile b/drivers/infiniband/hw/hns/Makefile index e105945b94a1..449a2d81319d 100644 --- a/drivers/infiniband/hw/hns/Makefile +++ b/drivers/infiniband/hw/hns/Makefile @@ -9,12 +9,8 @@ hns-roce-objs := hns_roce_main.o hns_roce_cmd.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_db.o hns_roce_srq.o hns_roce_restrack.o -ifdef CONFIG_INFINIBAND_HNS_HIP06 hns-roce-hw-v1-objs := hns_roce_hw_v1.o $(hns-roce-objs) -obj-$(CONFIG_INFINIBAND_HNS) += hns-roce-hw-v1.o -endif +obj-$(CONFIG_INFINIBAND_HNS_HIP06) += hns-roce-hw-v1.o -ifdef CONFIG_INFINIBAND_HNS_HIP08 hns-roce-hw-v2-objs := hns_roce_hw_v2.o hns_roce_hw_v2_dfx.o $(hns-roce-objs) -obj-$(CONFIG_INFINIBAND_HNS) += hns-roce-hw-v2.o -endif +obj-$(CONFIG_INFINIBAND_HNS_HIP08) += hns-roce-hw-v2.o |