diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-01-31 12:24:00 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-01-31 12:24:00 -0500 |
| commit | 30716e07ef511ec7525c07eb1e8060ba8943c2a2 (patch) | |
| tree | eb6a47cae63d3587fa773cc5a16781eaa2c7810b /arch/mips/momentum/ocelot_g/setup.c | |
| parent | 03c79cc56e4497cbd09d74a73c1bd0d1d9a8a16c (diff) | |
| parent | f56df2f4db6e4af87fb8e941cff69f4501a111df (diff) | |
Merge branch 'linus'
Diffstat (limited to 'arch/mips/momentum/ocelot_g/setup.c')
| -rw-r--r-- | arch/mips/momentum/ocelot_g/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/momentum/ocelot_g/setup.c b/arch/mips/momentum/ocelot_g/setup.c index d288f7b01842..9db638a7982c 100644 --- a/arch/mips/momentum/ocelot_g/setup.c +++ b/arch/mips/momentum/ocelot_g/setup.c | |||
| @@ -64,7 +64,7 @@ | |||
| 64 | 64 | ||
| 65 | #include "ocelot_pld.h" | 65 | #include "ocelot_pld.h" |
| 66 | 66 | ||
| 67 | #ifdef CONFIG_GALILLEO_GT64240_ETH | 67 | #ifdef CONFIG_GALILEO_GT64240_ETH |
| 68 | extern unsigned char prom_mac_addr_base[6]; | 68 | extern unsigned char prom_mac_addr_base[6]; |
| 69 | #endif | 69 | #endif |
| 70 | 70 | ||
| @@ -185,7 +185,7 @@ void __init plat_mem_setup(void) | |||
| 185 | /* do handoff reconfiguration */ | 185 | /* do handoff reconfiguration */ |
| 186 | PMON_v2_setup(); | 186 | PMON_v2_setup(); |
| 187 | 187 | ||
| 188 | #ifdef CONFIG_GALILLEO_GT64240_ETH | 188 | #ifdef CONFIG_GALILEO_GT64240_ETH |
| 189 | /* get the mac addr */ | 189 | /* get the mac addr */ |
| 190 | memcpy(prom_mac_addr_base, (void*)0xfc807cf2, 6); | 190 | memcpy(prom_mac_addr_base, (void*)0xfc807cf2, 6); |
| 191 | #endif | 191 | #endif |