diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-25 06:56:07 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-25 06:56:07 +0200 |
| commit | ea0763a7e62f60f3e166327268a80f16ad806718 (patch) | |
| tree | de54ec5e5d5a49b3cba81b096b7572852aa6f5a9 /arch/powerpc/sysdev/fsl_soc.c | |
| parent | [POWERPC] make checkstack work with ARCH=powerpc (diff) | |
| parent | [POWERPC] Use mpc8641hpcn PIC base address from dev tree. (diff) | |
| download | linux-ea0763a7e62f60f3e166327268a80f16ad806718.tar.xz linux-ea0763a7e62f60f3e166327268a80f16ad806718.zip | |
Merge branch 'merge'
Diffstat (limited to 'arch/powerpc/sysdev/fsl_soc.c')
| -rw-r--r-- | arch/powerpc/sysdev/fsl_soc.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c index 4a6aa640ac13..92ba378b7990 100644 --- a/arch/powerpc/sysdev/fsl_soc.c +++ b/arch/powerpc/sysdev/fsl_soc.c @@ -166,8 +166,16 @@ static int __init gfar_of_init(void) goto err; } - mac_addr = get_property(np, "address", NULL); - memcpy(gfar_data.mac_addr, mac_addr, 6); + mac_addr = get_property(np, "local-mac-address", NULL); + if (mac_addr == NULL) + mac_addr = get_property(np, "mac-address", NULL); + if (mac_addr == NULL) { + /* Obsolete */ + mac_addr = get_property(np, "address", NULL); + } + + if (mac_addr) + memcpy(gfar_data.mac_addr, mac_addr, 6); if (model && !strcasecmp(model, "TSEC")) gfar_data.device_flags = |