diff options
| author | Doug Ledford <dledford@redhat.com> | 2017-10-18 20:12:09 +0300 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-10-18 20:12:09 +0300 |
| commit | 894b82c427d069a773e1d1417fe30bd31aa18801 (patch) | |
| tree | 8b361de9085f7891b4a673064b55f34b17bccb1e /drivers/infiniband/hw/qib/qib_7220.h | |
| parent | 754137a769ac8f13cd6c0e1bc4fc2fa768d3da63 (diff) | |
| parent | a9346abed52f08e3e0ceb66d51f527ea11698d3c (diff) | |
| download | linux-894b82c427d069a773e1d1417fe30bd31aa18801.tar.xz | |
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/qib/qib_7220.h')
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_7220.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/qib/qib_7220.h b/drivers/infiniband/hw/qib/qib_7220.h index 4ec3dc1fbfb4..9ecaab6232e3 100644 --- a/drivers/infiniband/hw/qib/qib_7220.h +++ b/drivers/infiniband/hw/qib/qib_7220.h @@ -74,6 +74,7 @@ struct qib_chip_specific { char bitsmsgbuf[64]; struct timer_list relock_timer; unsigned int relock_interval; /* in jiffies */ + struct qib_devdata *dd; }; struct qib_chippport_specific { |