Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[sfrench/cifs-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 f415a1f18fba657c350c09c6ead11d0571e411ac..3ba4101d141eda4360f6a438cf2fafbcb5572553 100644 (file)
--- a/arch/mips/tx4938/common/setup.c
+++ b/arch/mips/tx4938/common/setup.c
@@ -24,46 +24,22 @@
 #include <linux/slab.h>
 #include <linux/random.h>
 #include <linux/irq.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/bootinfo.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #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);
-extern void rbtx4938_time_init(void);
 
 void __init tx4938_setup(void);
-void __init tx4938_time_init(void);
 void dump_cp0(char *key);
 
 void __init
 plat_mem_setup(void)
 {
-       board_time_init = tx4938_time_init;
        toshiba_rbtx4938_setup();
 }
-
-void __init
-tx4938_time_init(void)
-{
-       rbtx4938_time_init();
-}
-
-void __init plat_timer_setup(struct irqaction *irq)
-{
-       u32 count;
-       u32 c1;
-       u32 c2;
-
-       setup_irq(TX4938_IRQ_CPU_TIMER, irq);
-
-       c1 = read_c0_count();
-       count = c1 + (mips_hpt_frequency / HZ);
-       write_c0_compare(count);
-       c2 = read_c0_count();
-}