aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorTimur Tabi <timur@freescale.com>2007-02-21 14:40:12 -0600
committerJeff Garzik <jeff@garzik.org>2007-02-27 04:21:25 -0500
commite9eb70c92143c8f03e456aa60d89204b3311e554 (patch)
treefaffac60f29362b751c4633879bb58659bdfff96 /drivers/net
parentf19841f517f4db628366fa2f080dfa7ac24f0f51 (diff)
downloadkernel_samsung_smdk4412-e9eb70c92143c8f03e456aa60d89204b3311e554.zip
kernel_samsung_smdk4412-e9eb70c92143c8f03e456aa60d89204b3311e554.tar.gz
kernel_samsung_smdk4412-e9eb70c92143c8f03e456aa60d89204b3311e554.tar.bz2
ucc_geth: use of_get_mac_address()
Update ucc_geth_probe() to use function of_get_mac_address() to obtain the MAC address. Signed-off-by: Timur Tabi <timur@freescale.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ucc_geth.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index a2fc2bb..885e73d 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -4199,9 +4199,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
ugeth->ug_info = ug_info;
ugeth->dev = dev;
- mac_addr = get_property(np, "mac-address", NULL);
- if (mac_addr == NULL)
- mac_addr = get_property(np, "local-mac-address", NULL);
+ mac_addr = of_get_mac_address(np);
if (mac_addr)
memcpy(dev->dev_addr, mac_addr, 6);