diff options
Diffstat (limited to 'drivers/infiniband')
-rw-r--r-- | drivers/infiniband/hw/ehca/ehca_classes.h | 2 | ||||
-rw-r--r-- | drivers/infiniband/hw/ehca/ehca_main.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/infiniband/hw/ehca/ehca_classes.h b/drivers/infiniband/hw/ehca/ehca_classes.h index 0136abd50dd4..aaf6023a4835 100644 --- a/drivers/infiniband/hw/ehca/ehca_classes.h +++ b/drivers/infiniband/hw/ehca/ehca_classes.h | |||
@@ -112,7 +112,7 @@ struct ehca_sport { | |||
112 | 112 | ||
113 | struct ehca_shca { | 113 | struct ehca_shca { |
114 | struct ib_device ib_device; | 114 | struct ib_device ib_device; |
115 | struct of_device *ofdev; | 115 | struct platform_device *ofdev; |
116 | u8 num_ports; | 116 | u8 num_ports; |
117 | int hw_level; | 117 | int hw_level; |
118 | struct list_head shca_list; | 118 | struct list_head shca_list; |
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c index cfc4de7a5da4..c240e9972cb0 100644 --- a/drivers/infiniband/hw/ehca/ehca_main.c +++ b/drivers/infiniband/hw/ehca/ehca_main.c | |||
@@ -713,7 +713,7 @@ static struct attribute_group ehca_dev_attr_grp = { | |||
713 | .attrs = ehca_dev_attrs | 713 | .attrs = ehca_dev_attrs |
714 | }; | 714 | }; |
715 | 715 | ||
716 | static int __devinit ehca_probe(struct of_device *dev, | 716 | static int __devinit ehca_probe(struct platform_device *dev, |
717 | const struct of_device_id *id) | 717 | const struct of_device_id *id) |
718 | { | 718 | { |
719 | struct ehca_shca *shca; | 719 | struct ehca_shca *shca; |
@@ -879,7 +879,7 @@ probe1: | |||
879 | return -EINVAL; | 879 | return -EINVAL; |
880 | } | 880 | } |
881 | 881 | ||
882 | static int __devexit ehca_remove(struct of_device *dev) | 882 | static int __devexit ehca_remove(struct platform_device *dev) |
883 | { | 883 | { |
884 | struct ehca_shca *shca = dev_get_drvdata(&dev->dev); | 884 | struct ehca_shca *shca = dev_get_drvdata(&dev->dev); |
885 | unsigned long flags; | 885 | unsigned long flags; |