Merge branches 'release', 'asus', 'sony-laptop' and 'thinkpad' into release

[pandora-kernel.git] / arch / mips / mips-boards / sead / sead_setup.c

diff --git a/arch/mips/mips-boards/sead/sead_setup.c b/arch/mips/mips-boards/sead/sead_setup.c
index 811aba1..8aa8e5b 100644 (file)
--- a/arch/mips/mips-boards/sead/sead_setup.c
+++ b/arch/mips/mips-boards/sead/sead_setup.c
@@ -23,6 +23,7 @@
 #include <linux/tty.h>
 #include <linux/serial.h>
 #include <linux/serial_core.h>
+#include <linux/serial_8250.h>
 
 #include <asm/cpu.h>
 #include <asm/bootinfo.h>
@@ -33,9 +34,6 @@
 #include <asm/mips-boards/seadint.h>
 #include <asm/time.h>
 
-extern void mips_reboot_setup(void);
-extern void mips_time_init(void);
-
 static void __init serial_init(void);
 
 const char *get_system_type(void)
@@ -49,9 +47,7 @@ void __init plat_mem_setup(void)
 {
        ioport_resource.end = 0x7fffffff;
 
-       serial_init ();
-
-       board_time_init = mips_time_init;
+       serial_init();
 
        mips_reboot_setup();
 }
@@ -68,7 +64,7 @@ static void __init serial_init(void)
 #else
        s.iobase = SEAD_UART0_REGS_BASE+3;
 #endif
-       s.irq = MIPSCPU_INT_BASE + MIPSCPU_INT_UART0;
+       s.irq = MIPS_CPU_IRQ_BASE + MIPSCPU_INT_UART0;
        s.uartclk = SEAD_BASE_BAUD * 16;
        s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_AUTO_IRQ;
        s.iotype = UPIO_PORT;