diff options
author | Jeff Garzik | 2005-10-29 23:49:12 +0200 |
---|---|---|
committer | Jeff Garzik | 2005-10-29 23:49:12 +0200 |
commit | b0c4e148bd591629749d02a8fbc8d81c26d548cf (patch) | |
tree | 3e2142635f3dc2ceeae870ead2dceab7b9c6def1 /arch/mips/vr41xx/common/init.c | |
parent | Merge branch 'upstream' (diff) | |
parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
download | kernel-qcow2-linux-b0c4e148bd591629749d02a8fbc8d81c26d548cf.tar.gz kernel-qcow2-linux-b0c4e148bd591629749d02a8fbc8d81c26d548cf.tar.xz kernel-qcow2-linux-b0c4e148bd591629749d02a8fbc8d81c26d548cf.zip |
Merge branch 'master'
Diffstat (limited to 'arch/mips/vr41xx/common/init.c')
-rw-r--r-- | arch/mips/vr41xx/common/init.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/mips/vr41xx/common/init.c b/arch/mips/vr41xx/common/init.c index e03be896cbc4..578f6496ffd4 100644 --- a/arch/mips/vr41xx/common/init.c +++ b/arch/mips/vr41xx/common/init.c @@ -58,6 +58,14 @@ static void __init timer_init(void) board_timer_setup = setup_timer_irq; } +void __init plat_setup(void) +{ + vr41xx_calculate_clock_frequency(); + + timer_init(); + iomem_resource_init(); +} + void __init prom_init(void) { int argc, i; @@ -71,12 +79,6 @@ void __init prom_init(void) if (i < (argc - 1)) strcat(arcs_cmdline, " "); } - - vr41xx_calculate_clock_frequency(); - - timer_init(); - - iomem_resource_init(); } unsigned long __init prom_free_prom_memory (void) |