diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-31 00:14:26 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-31 00:14:26 -0400 |
| commit | d5b732b17ca2fc74f370bdba5aae6c804fac8c35 (patch) | |
| tree | 4facc6d96116b032a3c1cb2ced9b2a3008e9216e /drivers/infiniband/hw/mthca/mthca_provider.c | |
| parent | eb6e8605ee5f5b4e116451bf01b3f35eac446dde (diff) | |
| parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/infiniband/hw/mthca/mthca_provider.c')
| -rw-r--r-- | drivers/infiniband/hw/mthca/mthca_provider.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c index f080a784bc7..1e0b4b6074a 100644 --- a/drivers/infiniband/hw/mthca/mthca_provider.c +++ b/drivers/infiniband/hw/mthca/mthca_provider.c | |||
| @@ -1403,7 +1403,7 @@ int mthca_register_device(struct mthca_dev *dev) | |||
| 1403 | 1403 | ||
| 1404 | mutex_init(&dev->cap_mask_mutex); | 1404 | mutex_init(&dev->cap_mask_mutex); |
| 1405 | 1405 | ||
| 1406 | ret = ib_register_device(&dev->ib_dev); | 1406 | ret = ib_register_device(&dev->ib_dev, NULL); |
| 1407 | if (ret) | 1407 | if (ret) |
| 1408 | return ret; | 1408 | return ret; |
| 1409 | 1409 | ||