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 ab4082267553374cfaad83398bd2a37f25819e98..3ba4101d141eda4360f6a438cf2fafbcb5572553 100644 (file)
--- a/arch/mips/tx4938/common/setup.c
+++ b/arch/mips/tx4938/common/setup.c
@@ -24,7 +24,7 @@
 #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>
@@ -43,8 +43,3 @@ plat_mem_setup(void)
 {
        toshiba_rbtx4938_setup();
 }
-
-void __init plat_timer_setup(struct irqaction *irq)
-{
-       setup_irq(TX4938_IRQ_CPU_TIMER, irq);
-}