diff options
Diffstat (limited to 'drivers/net/sunhme.c')
-rw-r--r-- | drivers/net/sunhme.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c index 192bbc91c73..bee5e5b309b 100644 --- a/drivers/net/sunhme.c +++ b/drivers/net/sunhme.c | |||
@@ -2704,7 +2704,7 @@ static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe | |||
2704 | dev->dev_addr[i] = macaddr[i]; | 2704 | dev->dev_addr[i] = macaddr[i]; |
2705 | macaddr[5]++; | 2705 | macaddr[5]++; |
2706 | } else { | 2706 | } else { |
2707 | unsigned char *addr; | 2707 | const unsigned char *addr; |
2708 | int len; | 2708 | int len; |
2709 | 2709 | ||
2710 | addr = of_get_property(dp, "local-mac-address", &len); | 2710 | addr = of_get_property(dp, "local-mac-address", &len); |
@@ -3081,7 +3081,7 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev, | |||
3081 | macaddr[5]++; | 3081 | macaddr[5]++; |
3082 | } else { | 3082 | } else { |
3083 | #ifdef CONFIG_SPARC | 3083 | #ifdef CONFIG_SPARC |
3084 | unsigned char *addr; | 3084 | const unsigned char *addr; |
3085 | int len; | 3085 | int len; |
3086 | 3086 | ||
3087 | if (qfe_slot != -1 && | 3087 | if (qfe_slot != -1 && |
@@ -3300,7 +3300,7 @@ static int __devinit hme_sbus_probe(struct of_device *dev, const struct of_devic | |||
3300 | { | 3300 | { |
3301 | struct sbus_dev *sdev = to_sbus_device(&dev->dev); | 3301 | struct sbus_dev *sdev = to_sbus_device(&dev->dev); |
3302 | struct device_node *dp = dev->node; | 3302 | struct device_node *dp = dev->node; |
3303 | char *model = of_get_property(dp, "model", NULL); | 3303 | const char *model = of_get_property(dp, "model", NULL); |
3304 | int is_qfe = (match->data != NULL); | 3304 | int is_qfe = (match->data != NULL); |
3305 | 3305 | ||
3306 | if (!is_qfe && model && !strcmp(model, "SUNW,sbus-qfe")) | 3306 | if (!is_qfe && model && !strcmp(model, "SUNW,sbus-qfe")) |