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 / sibyte / swarm / setup.c

diff --git a/arch/mips/sibyte/swarm/setup.c b/arch/mips/sibyte/swarm/setup.c
index ac342f5..4b5f74f 100644 (file)
--- a/arch/mips/sibyte/swarm/setup.c
+++ b/arch/mips/sibyte/swarm/setup.c
@@ -21,13 +21,14 @@
  * Setup code for the SWARM board
  */
 
+#include <linux/config.h>
 #include <linux/spinlock.h>
 #include <linux/mm.h>
 #include <linux/bootmem.h>
 #include <linux/blkdev.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/screen_info.h>
+#include <linux/tty.h>
 #include <linux/initrd.h>
 
 #include <asm/irq.h>
@@ -71,13 +72,11 @@ const char *get_system_type(void)
 
 void __init swarm_time_init(void)
 {
-#if defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)
        /* Setup HPT */
        sb1250_hpt_setup();
-#endif
 }
 
-void __init plat_timer_setup(struct irqaction *irq)
+void __init swarm_timer_setup(struct irqaction *irq)
 {
         /*
          * we don't set up irqaction, because we will deliver timer
@@ -104,7 +103,7 @@ int swarm_be_handler(struct pt_regs *regs, int is_fixup)
        return (is_fixup ? MIPS_BE_FIXUP : MIPS_BE_FATAL);
 }
 
-void __init plat_mem_setup(void)
+void __init plat_setup(void)
 {
 #if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)
        bcm1480_setup();
@@ -117,6 +116,7 @@ void __init plat_mem_setup(void)
        panic_timeout = 5;  /* For debug.  */
 
        board_time_init = swarm_time_init;
+       board_timer_setup = swarm_timer_setup;
        board_be_handler = swarm_be_handler;
 
        if (xicor_probe()) {