Merge tag 'for-next-dma_ops' of git://git.kernel.org/pub/scm/linux/kernel/git/dledfor...

[karo-tx-linux.git] / drivers / infiniband / hw / mlx4 / main.c

diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index 211cbbe9ccd1e7a97540df1fed2d838f03139e90..88608906ce2503987e4c100506d698a3da89a65c 100644 (file)
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -2628,7 +2628,7 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
        ibdev->ib_dev.phys_port_cnt     = mlx4_is_bonded(dev) ?
                                                1 : ibdev->num_ports;
        ibdev->ib_dev.num_comp_vectors  = dev->caps.num_comp_vectors;
-       ibdev->ib_dev.dma_device        = &dev->persist->pdev->dev;
+       ibdev->ib_dev.dev.parent        = &dev->persist->pdev->dev;
        ibdev->ib_dev.get_netdev        = mlx4_ib_get_netdev;
        ibdev->ib_dev.add_gid           = mlx4_ib_add_gid;
        ibdev->ib_dev.del_gid           = mlx4_ib_del_gid;