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