fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/arch/mips/tx4938/common/setup.c b/arch/mips/tx4938/common/setup.c
index fc99295..dc87d92 100644 (file)
--- a/arch/mips/tx4938/common/setup.c
+++ b/arch/mips/tx4938/common/setup.c
@@ -31,7 +31,6 @@
 #include <asm/mipsregs.h>
 #include <asm/system.h>
 #include <asm/time.h>
-#include <asm/time.h>
 #include <asm/tx4938/rbtx4938.h>
 
 extern void toshiba_rbtx4938_setup(void);
@@ -39,33 +38,12 @@ extern void rbtx4938_time_init(void);
 
 void __init tx4938_setup(void);
 void __init tx4938_time_init(void);
-void __init tx4938_timer_setup(struct irqaction *irq);
 void dump_cp0(char *key);
 
-void (*__wbflush) (void);
-
-static void
-tx4938_write_buffer_flush(void)
-{
-       mmiowb();
-
-       __asm__ __volatile__(
-               ".set   push\n\t"
-               ".set   noreorder\n\t"
-               "lw     $0,%0\n\t"
-               "nop\n\t"
-               ".set   pop"
-               : /* no output */
-               : "m" (*(int *)KSEG1)
-               : "memory");
-}
-
 void __init
-plat_setup(void)
+plat_mem_setup(void)
 {
        board_time_init = tx4938_time_init;
-       board_timer_setup = tx4938_timer_setup;
-       __wbflush = tx4938_write_buffer_flush;
        toshiba_rbtx4938_setup();
 }
 
@@ -75,8 +53,7 @@ tx4938_time_init(void)
        rbtx4938_time_init();
 }
 
-void __init
-tx4938_timer_setup(struct irqaction *irq)
+void __init plat_timer_setup(struct irqaction *irq)
 {
        u32 count;
        u32 c1;