X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fmips%2Fsibyte%2Fswarm%2Fsetup.c;fp=arch%2Fmips%2Fsibyte%2Fswarm%2Fsetup.c;h=b661d2425a369bae38caa0b60141449c9f9c6655;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=ac342f5643c9d3481d1cd921355b4959114f34e9;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/arch/mips/sibyte/swarm/setup.c b/arch/mips/sibyte/swarm/setup.c
index ac342f564..b661d2425 100644
--- 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,18 +116,19 @@ 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()) {
 		printk("swarm setup: Xicor 1241 RTC detected.\n");
-		rtc_mips_get_time = xicor_get_time;
-		rtc_mips_set_time = xicor_set_time;
+		rtc_get_time = xicor_get_time;
+		rtc_set_time = xicor_set_time;
 	}
 
 	if (m41t81_probe()) {
 		printk("swarm setup: M41T81 RTC detected.\n");
-		rtc_mips_get_time = m41t81_get_time;
-		rtc_mips_set_time = m41t81_set_time;
+		rtc_get_time = m41t81_get_time;
+		rtc_set_time = m41t81_set_time;
 	}
 
 	printk("This kernel optimized for "