linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / mips / vr41xx / common / init.c

diff --git a/arch/mips/vr41xx/common/init.c b/arch/mips/vr41xx/common/init.c
index a2e285c..707bd09 100644 (file)
--- a/arch/mips/vr41xx/common/init.c
+++ b/arch/mips/vr41xx/common/init.c
@@ -24,7 +24,6 @@
 
 #include <asm/bootinfo.h>
 #include <asm/time.h>
-#include <asm/vr41xx/irq.h>
 #include <asm/vr41xx/vr41xx.h>
 
 #define IO_MEM_RESOURCE_START  0UL
@@ -48,7 +47,7 @@ static void __init setup_timer_frequency(void)
                mips_hpt_frequency = tclock / 4;
 }
 
-void __init plat_timer_setup(struct irqaction *irq)
+static void __init setup_timer_irq(struct irqaction *irq)
 {
        setup_irq(TIMER_IRQ, irq);
 }
@@ -56,9 +55,10 @@ void __init plat_timer_setup(struct irqaction *irq)
 static void __init timer_init(void)
 {
        board_time_init = setup_timer_frequency;
+       board_timer_setup = setup_timer_irq;
 }
 
-void __init plat_mem_setup(void)
+void __init plat_setup(void)
 {
        vr41xx_calculate_clock_frequency();