diff options
| author | Doug Ledford <dledford@redhat.com> | 2019-02-13 09:35:39 -0500 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2019-02-13 09:35:39 -0500 |
| commit | d892273bb5b6fe2a3b5d2d147153e35b447e9041 (patch) | |
| tree | a7911a3a09851d252a24f5dae6b69141939714e3 /drivers/infiniband/hw/cxgb4/t4.h | |
| parent | 82771f20338fcdeb0a38319c7a72f1f36df39a7a (diff) | |
| parent | a87145957eb9c474559b3acd2cfc6e8914b0e08f (diff) | |
| download | linux-d892273bb5b6fe2a3b5d2d147153e35b447e9041.tar.bz2 | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma into for-next
I had merged the hfi1-tid code into my local copy of for-next, but was
waiting on 0day testing before pushing it (I pushed it to my wip
branch). Having waited several days for 0day testing to show up, I'm
finally just going to push it out. In the meantime, though, Jason
pushed other stuff to for-next, so I needed to merge up the branches
before pushing.
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/hw/cxgb4/t4.h')
| -rw-r--r-- | drivers/infiniband/hw/cxgb4/t4.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/cxgb4/t4.h b/drivers/infiniband/hw/cxgb4/t4.h index fff6d48d262f..b170817b2741 100644 --- a/drivers/infiniband/hw/cxgb4/t4.h +++ b/drivers/infiniband/hw/cxgb4/t4.h @@ -35,6 +35,7 @@ #include "t4_regs.h" #include "t4_values.h" #include "t4_msg.h" +#include "t4_tcb.h" #include "t4fw_ri_api.h" #define T4_MAX_NUM_PD 65536 |