projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into upstream
[powerpc.git]
/
drivers
/
infiniband
/
hw
/
mthca
/
mthca_av.c
diff --git
a/drivers/infiniband/hw/mthca/mthca_av.c
b/drivers/infiniband/hw/mthca/mthca_av.c
index
6959945
..
57cdc1b
100644
(file)
--- a/
drivers/infiniband/hw/mthca/mthca_av.c
+++ b/
drivers/infiniband/hw/mthca/mthca_av.c
@@
-33,7
+33,6
@@
* $Id: mthca_av.c 1349 2004-12-16 21:09:43Z roland $
*/
* $Id: mthca_av.c 1349 2004-12-16 21:09:43Z roland $
*/
-#include <linux/init.h>
#include <linux/string.h>
#include <linux/slab.h>
#include <linux/string.h>
#include <linux/slab.h>
@@
-323,7
+322,7
@@
int mthca_ah_query(struct ib_ah *ibah, struct ib_ah_attr *attr)
return 0;
}
return 0;
}
-int
__devinit
mthca_init_av_table(struct mthca_dev *dev)
+int mthca_init_av_table(struct mthca_dev *dev)
{
int err;
{
int err;