Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / arch / mips / lasat / setup.c

diff --git a/arch/mips/lasat/setup.c b/arch/mips/lasat/setup.c
index 0ffc43c..bb70a82 100644 (file)
--- a/arch/mips/lasat/setup.c
+++ b/arch/mips/lasat/setup.c
@@ -22,6 +22,7 @@
  *
  * Lasat specific setup.
  */
+#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/pci.h>
@@ -115,9 +116,12 @@ static void lasat_time_init(void)
        mips_hpt_frequency = lasat_board_info.li_cpu_hz / 2;
 }
 
-void __init plat_timer_setup(struct irqaction *irq)
+static void lasat_timer_setup(struct irqaction *irq)
 {
-       write_c0_compare( read_c0_count() + mips_hpt_frequency / HZ);
+
+       write_c0_compare(
+               read_c0_count() +
+               mips_hpt_frequency / HZ);
        change_c0_status(ST0_IM, IE_IRQ0 | IE_IRQ5);
 }
 
@@ -151,7 +155,7 @@ void __init serial_init(void)
 }
 #endif
 
-void __init plat_mem_setup(void)
+void __init plat_setup(void)
 {
        int i;
        lasat_misc  = &lasat_misc_info[mips_machtype];
@@ -167,6 +171,7 @@ void __init plat_mem_setup(void)
        lasat_reboot_setup();
 
        board_time_init = lasat_time_init;
+       board_timer_setup = lasat_timer_setup;
 
 #ifdef CONFIG_DS1603
        ds1603 = &ds_defs[mips_machtype];