diff options
Diffstat (limited to 'drivers/net/niu.c')
-rw-r--r-- | drivers/net/niu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/niu.c b/drivers/net/niu.c index 404f2d552888..bc695d53cdcc 100644 --- a/drivers/net/niu.c +++ b/drivers/net/niu.c | |||
@@ -9103,7 +9103,7 @@ retry: | |||
9103 | static int __devinit niu_n2_irq_init(struct niu *np, u8 *ldg_num_map) | 9103 | static int __devinit niu_n2_irq_init(struct niu *np, u8 *ldg_num_map) |
9104 | { | 9104 | { |
9105 | #ifdef CONFIG_SPARC64 | 9105 | #ifdef CONFIG_SPARC64 |
9106 | struct of_device *op = np->op; | 9106 | struct platform_device *op = np->op; |
9107 | const u32 *int_prop; | 9107 | const u32 *int_prop; |
9108 | int i; | 9108 | int i; |
9109 | 9109 | ||
@@ -9688,7 +9688,7 @@ static void __devinit niu_driver_version(void) | |||
9688 | 9688 | ||
9689 | static struct net_device * __devinit niu_alloc_and_init( | 9689 | static struct net_device * __devinit niu_alloc_and_init( |
9690 | struct device *gen_dev, struct pci_dev *pdev, | 9690 | struct device *gen_dev, struct pci_dev *pdev, |
9691 | struct of_device *op, const struct niu_ops *ops, | 9691 | struct platform_device *op, const struct niu_ops *ops, |
9692 | u8 port) | 9692 | u8 port) |
9693 | { | 9693 | { |
9694 | struct net_device *dev; | 9694 | struct net_device *dev; |
@@ -10064,7 +10064,7 @@ static const struct niu_ops niu_phys_ops = { | |||
10064 | .unmap_single = niu_phys_unmap_single, | 10064 | .unmap_single = niu_phys_unmap_single, |
10065 | }; | 10065 | }; |
10066 | 10066 | ||
10067 | static int __devinit niu_of_probe(struct of_device *op, | 10067 | static int __devinit niu_of_probe(struct platform_device *op, |
10068 | const struct of_device_id *match) | 10068 | const struct of_device_id *match) |
10069 | { | 10069 | { |
10070 | union niu_parent_id parent_id; | 10070 | union niu_parent_id parent_id; |
@@ -10179,7 +10179,7 @@ err_out: | |||
10179 | return err; | 10179 | return err; |
10180 | } | 10180 | } |
10181 | 10181 | ||
10182 | static int __devexit niu_of_remove(struct of_device *op) | 10182 | static int __devexit niu_of_remove(struct platform_device *op) |
10183 | { | 10183 | { |
10184 | struct net_device *dev = dev_get_drvdata(&op->dev); | 10184 | struct net_device *dev = dev_get_drvdata(&op->dev); |
10185 | 10185 | ||