From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 26 Oct 2007 12:43:32 +0000 (+0100)
Subject: [MIPS] time: Merge lasat plat_timer_setup into plat_time_init.
X-Git-Tag: v2.6.24-rc2~95^2~22
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ba5eac515f73910744c5d9f8fc1c5d6548cf6ff4;p=~emulex%2Finfiniband.git

[MIPS] time: Merge lasat plat_timer_setup into plat_time_init.

Since the cp0 compare interrupt handler isn't initialized by the time
plat_time_init is called don't set IE_IRQ5 anymore, cevt-r4k.c will do
that a little later itself.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

diff --git a/arch/mips/lasat/setup.c b/arch/mips/lasat/setup.c
index 54827d0174b..e072da4ff3b 100644
--- a/arch/mips/lasat/setup.c
+++ b/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)