From: Andrew Morton <akpm@linux-foundation.org>

I didn't try very hard on this one.

Cc: Greg KH <greg@kroah.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/infiniband/hw/ipath/ipath_verbs.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/infiniband/hw/ipath/ipath_verbs.c~gregkh-driver-ib-convert-struct-class_device-to-struct-device-vs-git-infiniband drivers/infiniband/hw/ipath/ipath_verbs.c
--- a/drivers/infiniband/hw/ipath/ipath_verbs.c~gregkh-driver-ib-convert-struct-class_device-to-struct-device-vs-git-infiniband
+++ a/drivers/infiniband/hw/ipath/ipath_verbs.c
@@ -2068,7 +2068,7 @@ int ipath_register_ib_device(struct ipat
 	dev->phys_port_cnt = 1;
 	dev->num_comp_vectors = 1;
 	dev->dma_device = &dd->pcidev->dev;
-	dev->class_dev.dev = dev->dma_device;
+//	dev->class_dev.dev = dev->dma_device;
 	dev->query_device = ipath_query_device;
 	dev->modify_device = ipath_modify_device;
 	dev->query_port = ipath_query_port;
_