diff --git a/[refs] b/[refs]
index e2425bf2dc38..47fa176cbd37 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da349bef9700e0dbf69e4273fa87c476c46c454f
+refs/heads/master: ba5eac515f73910744c5d9f8fc1c5d6548cf6ff4
diff --git a/trunk/arch/mips/lasat/setup.c b/trunk/arch/mips/lasat/setup.c
index 54827d0174bf..e072da4ff3b3 100644
--- a/trunk/arch/mips/lasat/setup.c
+++ b/trunk/arch/mips/lasat/setup.c
@@ -117,14 +117,11 @@ static struct notifier_block lasat_panic_block[] =
 	}
 };
 
-void plat_time_init(void)
+void __init plat_time_init(void)
 {
 	mips_hpt_frequency = lasat_board_info.li_cpu_hz / 2;
-}
 
-void __init plat_timer_setup(struct irqaction *irq)
-{
-	change_c0_status(ST0_IM, IE_IRQ0 | IE_IRQ5);
+	change_c0_status(ST0_IM, IE_IRQ0);
 }
 
 void __init plat_mem_setup(void)