diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-26 08:24:31 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-26 08:24:31 -0400 |
| commit | a48141db68e4b9143759435badcc1a49d9022db4 (patch) | |
| tree | a7d9e5e259c5aa44131e5d1e280f772edb5cdeb5 /drivers/net/mace.c | |
| parent | 0999ed7f57728c1919b131207e47d9b311cfbd74 (diff) | |
Revert "[POWERPC] Rename get_property to of_get_property: drivers"
This reverts commit d05c7a80cf39ae7d0f8d0c3e47c93d51fcd393d3,
which included changes which should go via other subsystem
maintainers.
Diffstat (limited to 'drivers/net/mace.c')
| -rw-r--r-- | drivers/net/mace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/mace.c b/drivers/net/mace.c index 7018ba92ce8f..9ec24f0d5d68 100644 --- a/drivers/net/mace.c +++ b/drivers/net/mace.c | |||
| @@ -110,9 +110,9 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i | |||
| 110 | return -ENODEV; | 110 | return -ENODEV; |
| 111 | } | 111 | } |
| 112 | 112 | ||
| 113 | addr = of_get_property(mace, "mac-address", NULL); | 113 | addr = get_property(mace, "mac-address", NULL); |
| 114 | if (addr == NULL) { | 114 | if (addr == NULL) { |
| 115 | addr = of_get_property(mace, "local-mac-address", NULL); | 115 | addr = get_property(mace, "local-mac-address", NULL); |
| 116 | if (addr == NULL) { | 116 | if (addr == NULL) { |
| 117 | printk(KERN_ERR "Can't get mac-address for MACE %s\n", | 117 | printk(KERN_ERR "Can't get mac-address for MACE %s\n", |
| 118 | mace->full_name); | 118 | mace->full_name); |