diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-02-01 08:16:22 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-02-01 08:16:22 +0300 |
| commit | a1f3d4bba8ea395a39d34ade6017afee8be16031 (patch) | |
| tree | 874d843d35622f17aa6c3e048e42cf0d679bcb75 /drivers/infiniband/hw/qib/qib_iba6120.c | |
| parent | 723d928417bffff6467da155d8ebbbe016464012 (diff) | |
| parent | ebf53826e105f488f4f628703a108e98940d1dc5 (diff) | |
| download | linux-a1f3d4bba8ea395a39d34ade6017afee8be16031.tar.xz | |
Merge commit 'v2.6.38-rc3' into next
Diffstat (limited to 'drivers/infiniband/hw/qib/qib_iba6120.c')
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_iba6120.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/qib/qib_iba6120.c b/drivers/infiniband/hw/qib/qib_iba6120.c index a5e29dbb9537..774dea897e9c 100644 --- a/drivers/infiniband/hw/qib/qib_iba6120.c +++ b/drivers/infiniband/hw/qib/qib_iba6120.c @@ -2074,7 +2074,7 @@ static void qib_6120_config_ctxts(struct qib_devdata *dd) } static void qib_update_6120_usrhead(struct qib_ctxtdata *rcd, u64 hd, - u32 updegr, u32 egrhd) + u32 updegr, u32 egrhd, u32 npkts) { qib_write_ureg(rcd->dd, ur_rcvhdrhead, hd, rcd->ctxt); if (updegr) |