diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-23 23:29:14 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-23 23:29:14 -0500 |
| commit | dcb571be2019ae677bc5ed64437dbc87ae1eb67f (patch) | |
| tree | 1b93f9ea3568be4dcc49ffb2adc0d3ab0a02b47f /arch/powerpc/boot/cuboot-85xx.c | |
| parent | 9156ad48338e0306e508ead5c0d9986050744475 (diff) | |
| parent | 96f39c1718091d63dc1c5012d566737ea0d2a20c (diff) | |
Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.25
Diffstat (limited to 'arch/powerpc/boot/cuboot-85xx.c')
| -rw-r--r-- | arch/powerpc/boot/cuboot-85xx.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/boot/cuboot-85xx.c b/arch/powerpc/boot/cuboot-85xx.c index 943779ed19be..6776a1a29f13 100644 --- a/arch/powerpc/boot/cuboot-85xx.c +++ b/arch/powerpc/boot/cuboot-85xx.c | |||
| @@ -24,8 +24,9 @@ static void platform_fixups(void) | |||
| 24 | void *soc; | 24 | void *soc; |
| 25 | 25 | ||
| 26 | dt_fixup_memory(bd.bi_memstart, bd.bi_memsize); | 26 | dt_fixup_memory(bd.bi_memstart, bd.bi_memsize); |
| 27 | dt_fixup_mac_addresses(bd.bi_enetaddr, bd.bi_enet1addr, | 27 | dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr); |
| 28 | bd.bi_enet2addr); | 28 | dt_fixup_mac_address_by_alias("ethernet1", bd.bi_enet1addr); |
| 29 | dt_fixup_mac_address_by_alias("ethernet2", bd.bi_enet2addr); | ||
| 29 | dt_fixup_cpu_clocks(bd.bi_intfreq, bd.bi_busfreq / 8, bd.bi_busfreq); | 30 | dt_fixup_cpu_clocks(bd.bi_intfreq, bd.bi_busfreq / 8, bd.bi_busfreq); |
| 30 | 31 | ||
| 31 | /* Unfortunately, the specific model number is encoded in the | 32 | /* Unfortunately, the specific model number is encoded in the |