git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
[pandora-kernel.git]
/
drivers
/
infiniband
/
hw
/
ehca
/
ehca_main.c
diff --git
a/drivers/infiniband/hw/ehca/ehca_main.c
b/drivers/infiniband/hw/ehca/ehca_main.c
index
252489e
..
ecb51b3
100644
(file)
--- 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);