diff options
Diffstat (limited to 'drivers/net/bmac.c')
-rw-r--r-- | drivers/net/bmac.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c index 4612725965df..9b8d7d9dbe86 100644 --- a/drivers/net/bmac.c +++ b/drivers/net/bmac.c | |||
@@ -1260,9 +1260,10 @@ static int __devinit bmac_probe(struct macio_dev *mdev, const struct of_device_i | |||
1260 | printk(KERN_ERR "BMAC: can't use, need 3 addrs and 3 intrs\n"); | 1260 | printk(KERN_ERR "BMAC: can't use, need 3 addrs and 3 intrs\n"); |
1261 | return -ENODEV; | 1261 | return -ENODEV; |
1262 | } | 1262 | } |
1263 | prop_addr = get_property(macio_get_of_node(mdev), "mac-address", NULL); | 1263 | prop_addr = of_get_property(macio_get_of_node(mdev), |
1264 | "mac-address", NULL); | ||
1264 | if (prop_addr == NULL) { | 1265 | if (prop_addr == NULL) { |
1265 | prop_addr = get_property(macio_get_of_node(mdev), | 1266 | prop_addr = of_get_property(macio_get_of_node(mdev), |
1266 | "local-mac-address", NULL); | 1267 | "local-mac-address", NULL); |
1267 | if (prop_addr == NULL) { | 1268 | if (prop_addr == NULL) { |
1268 | printk(KERN_ERR "BMAC: Can't get mac-address\n"); | 1269 | printk(KERN_ERR "BMAC: Can't get mac-address\n"); |