Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

[pandora-kernel.git] / drivers / infiniband / hw / nes / nes_verbs.c

diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
index 925e1f2..9bc2d74 100644 (file)
--- a/drivers/infiniband/hw/nes/nes_verbs.c
+++ b/drivers/infiniband/hw/nes/nes_verbs.c
@@ -3962,7 +3962,7 @@ int nes_register_ofa_device(struct nes_ib_device *nesibdev)
        struct nes_adapter *nesadapter = nesdev->nesadapter;
        int i, ret;
 
-       ret = ib_register_device(&nesvnic->nesibdev->ibdev);
+       ret = ib_register_device(&nesvnic->nesibdev->ibdev, NULL);
        if (ret) {
                return ret;
        }