Merge master.kernel.org:/home/rmk/linux-2.6-serial

[pandora-kernel.git] / arch / mips / sibyte / swarm / setup.c

diff --git a/arch/mips/sibyte/swarm/setup.c b/arch/mips/sibyte/swarm/setup.c
index b661d24..2996e33 100644 (file)
--- a/arch/mips/sibyte/swarm/setup.c
+++ b/arch/mips/sibyte/swarm/setup.c
@@ -21,14 +21,13 @@
  * 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/tty.h>
+#include <linux/screen_info.h>
 #include <linux/initrd.h>
 
 #include <asm/irq.h>
@@ -72,8 +71,10 @@ 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 swarm_timer_setup(struct irqaction *irq)
@@ -103,7 +104,7 @@ int swarm_be_handler(struct pt_regs *regs, int is_fixup)
        return (is_fixup ? MIPS_BE_FIXUP : MIPS_BE_FATAL);
 }
 
-void __init plat_setup(void)
+void __init plat_mem_setup(void)
 {
 #if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)
        bcm1480_setup();
@@ -121,14 +122,14 @@ void __init plat_setup(void)
 
        if (xicor_probe()) {
                printk("swarm setup: Xicor 1241 RTC detected.\n");
-               rtc_get_time = xicor_get_time;
-               rtc_set_time = xicor_set_time;
+               rtc_mips_get_time = xicor_get_time;
+               rtc_mips_set_time = xicor_set_time;
        }
 
        if (m41t81_probe()) {
                printk("swarm setup: M41T81 RTC detected.\n");
-               rtc_get_time = m41t81_get_time;
-               rtc_set_time = m41t81_set_time;
+               rtc_mips_get_time = m41t81_get_time;
+               rtc_mips_set_time = m41t81_set_time;
        }
 
        printk("This kernel optimized for "