diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-25 11:59:47 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-25 11:59:47 +1000 |
| commit | e40735e37d0834d6aaae00efb44c93acf22f054a (patch) | |
| tree | 325bce7b7a0327beadafb5c32392171e1f4c4df1 /drivers/infiniband/hw/ehca/ehca_main.c | |
| parent | 1a5461c0923023431e5b6d57aef9e1a80a5d7524 (diff) | |
| parent | a466d31eed0552f40f64c97a55accc0ae29601d8 (diff) | |
Merge remote branch 'infiniband/for-next'
Diffstat (limited to 'drivers/infiniband/hw/ehca/ehca_main.c')
| -rw-r--r-- | drivers/infiniband/hw/ehca/ehca_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c index 252489e88369..ecb51b396c42 100644 --- a/drivers/infiniband/hw/ehca/ehca_main.c +++ b/drivers/infiniband/hw/ehca/ehca_main.c @@ -799,7 +799,7 @@ static int __devinit ehca_probe(struct of_device *dev, goto probe5; } - ret = ib_register_device(&shca->ib_device); + ret = ib_register_device(&shca->ib_device, NULL); if (ret) { ehca_err(&shca->ib_device, "ib_register_device() failed ret=%i", ret); |