Merge tag 'ceph-for-4.11-rc1' of git://github.com/ceph/ceph-client

[karo-tx-linux.git] / drivers / infiniband / hw / ocrdma / ocrdma_main.c

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
index 3e43bdc81e7a5b49574c5b5460e0f7a38636e199..57c9a2ad0260bfd26366cacdfcfedca48308f80a 100644 (file)
--- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
@@ -199,7 +199,7 @@ static int ocrdma_register_device(struct ocrdma_dev *dev)
        dev->ibdev.alloc_ucontext = ocrdma_alloc_ucontext;
        dev->ibdev.dealloc_ucontext = ocrdma_dealloc_ucontext;
        dev->ibdev.mmap = ocrdma_mmap;
-       dev->ibdev.dma_device = &dev->nic_info.pdev->dev;
+       dev->ibdev.dev.parent = &dev->nic_info.pdev->dev;
 
        dev->ibdev.process_mad = ocrdma_process_mad;
        dev->ibdev.get_port_immutable = ocrdma_port_immutable;