diff options
| author |   Doug Ledford <dledford@redhat.com> | 2017-10-18 13:12:09 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-10-18 13:12:09 -0400 |
| commit | 894b82c427d069a773e1d1417fe30bd31aa18801 (patch) | |
| tree | 8b361de9085f7891b4a673064b55f34b17bccb1e /drivers/infiniband/hw/nes/nes_hw.h | |
| parent | Merge branch 'for-next-early' into for-next (diff) | |
| parent | RDMA/cxgb4: Convert timers to use timer_setup() (diff) | |
| download | linux-dev-894b82c427d069a773e1d1417fe30bd31aa18801.tar.xz linux-dev-894b82c427d069a773e1d1417fe30bd31aa18801.zip | |
Merge branch 'timer_setup' into for-next
Conflicts:
drivers/infiniband/hw/cxgb4/cm.c
drivers/infiniband/hw/qib/qib_driver.c
drivers/infiniband/hw/qib/qib_mad.c
There were minor fixups needed in these files. Just minor context diffs
due to patches from independent sources touching the same basic area.
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/hw/nes/nes_hw.h')
| -rw-r--r-- | drivers/infiniband/hw/nes/nes_hw.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/nes/nes_hw.h b/drivers/infiniband/hw/nes/nes_hw.h index 1b66ef1e9937..3c56470816a8 100644 --- a/drivers/infiniband/hw/nes/nes_hw.h +++ b/drivers/infiniband/hw/nes/nes_hw.h @@ -1164,6 +1164,7 @@ struct nes_adapter { u8 log_port; /* PCI information */ + struct nes_device *nesdev; unsigned int devfn; unsigned char bus_number; unsigned char OneG_Mode; |