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

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

diff --git a/arch/mips/tx4938/common/setup.c b/arch/mips/tx4938/common/setup.c
index 04f009ccb0eb351ed0846400a012e9090eed3f73..3ba4101d141eda4360f6a438cf2fafbcb5572553 100644 (file)
--- a/arch/mips/tx4938/common/setup.c
+++ b/arch/mips/tx4938/common/setup.c
@@ -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);
-}