diff options
| author | Bryan O'Sullivan <bos@pathscale.com> | 2006-08-25 18:24:31 (GMT) |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2006-09-22 22:22:30 (GMT) |
| commit | b1c1b6a30eac88665a35a207cc5e6233090b9d65 (patch) | |
| tree | 7f2351404d45a48688e3cc2be355d2fb016e4b18 /drivers/infiniband/hw/ipath/ipath_intr.c | |
| parent | 367fe711c5dc85dbc3265cf01e34d4d6fbd55f06 (diff) | |
| download | linux-fsl-qoriq-b1c1b6a30eac88665a35a207cc5e6233090b9d65.tar.xz | |
IB/ipath: merge ipath_core and ib_ipath drivers
There is little point in keeping the two drivers separate, so we are
merging them.
Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband/hw/ipath/ipath_intr.c')
| -rw-r--r-- | drivers/infiniband/hw/ipath/ipath_intr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_intr.c b/drivers/infiniband/hw/ipath/ipath_intr.c index 280e732..ed54f8f 100644 --- a/drivers/infiniband/hw/ipath/ipath_intr.c +++ b/drivers/infiniband/hw/ipath/ipath_intr.c @@ -35,6 +35,7 @@ #include "ipath_kernel.h" #include "ipath_layer.h" +#include "ipath_verbs.h" #include "ipath_common.h" /* These are all rcv-related errors which we want to count for stats */ @@ -712,7 +713,7 @@ static void handle_layer_pioavail(struct ipath_devdata *dd) if (ret > 0) goto set; - ret = __ipath_verbs_piobufavail(dd); + ret = ipath_ib_piobufavail(dd->verbs_dev); if (ret > 0) goto set; |