Merge ../linux-2.6 by hand

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)