From 7f1044827b8de5dd337e09b19417ac8312c1217e Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Tue, 22 Apr 2008 10:24:24 +1000 Subject: [PATCH] --- yaml --- r: 91795 b: refs/heads/master c: 2848077044a5fdeb942bd1342c550da4c452d66a h: refs/heads/master i: 91793: 3e39d89a327d421fc1c4c891c2d580ea77f41234 91791: 606b59aa9ca2ce7400ada40f405db0a891b881f6 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/ipath/ipath_verbs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 05eaff8abc04..a93f5db1f55f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 135cedad7457be6a96d5e151dfd48f7888a75e94 +refs/heads/master: 2848077044a5fdeb942bd1342c550da4c452d66a diff --git a/trunk/drivers/infiniband/hw/ipath/ipath_verbs.c b/trunk/drivers/infiniband/hw/ipath/ipath_verbs.c index c38f9aa8be8d..c43f2d286f8f 100644 --- a/trunk/drivers/infiniband/hw/ipath/ipath_verbs.c +++ b/trunk/drivers/infiniband/hw/ipath/ipath_verbs.c @@ -2067,7 +2067,7 @@ int ipath_register_ib_device(struct ipath_devdata *dd) dev->phys_port_cnt = 1; dev->num_comp_vectors = 1; dev->dma_device = &dd->pcidev->dev; - dev->class_dev.dev = dev->dma_device; + dev->dev.parent = dev->dma_device; dev->query_device = ipath_query_device; dev->modify_device = ipath_modify_device; dev->query_port = ipath_query_port;