diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-04-03 22:40:39 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-13 03:55:19 +1000 |
| commit | d05c7a80cf39ae7d0f8d0c3e47c93d51fcd393d3 (patch) | |
| tree | 6b51334a2427c0392c391d0e0bfab0ab9aae690e /drivers/net/bmac.c | |
| parent | c4f55b394505fff6ad831d17e36e02dde1c3a8d7 (diff) | |
[POWERPC] Rename get_property to of_get_property: drivers
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
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 c143304dcff..aa01ba347fe 100644 --- a/drivers/net/bmac.c +++ b/drivers/net/bmac.c @@ -1261,9 +1261,10 @@ static int __devinit bmac_probe(struct macio_dev *mdev, const struct of_device_i printk(KERN_ERR "BMAC: can't use, need 3 addrs and 3 intrs\n"); return -ENODEV; } - prop_addr = get_property(macio_get_of_node(mdev), "mac-address", NULL); + prop_addr = of_get_property(macio_get_of_node(mdev), + "mac-address", NULL); if (prop_addr == NULL) { - prop_addr = get_property(macio_get_of_node(mdev), + prop_addr = of_get_property(macio_get_of_node(mdev), "local-mac-address", NULL); if (prop_addr == NULL) { printk(KERN_ERR "BMAC: Can't get mac-address\n"); |