]> err.no Git - linux-2.6/commitdiff
[MIPS] time: Merge lasat plat_timer_setup into plat_time_init.
authorRalf Baechle <ralf@linux-mips.org>
Fri, 26 Oct 2007 12:43:32 +0000 (13:43 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Mon, 29 Oct 2007 19:35:34 +0000 (19:35 +0000)
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>
arch/mips/lasat/setup.c

index 54827d0174bfe208cd2552482450bb60a975998f..e072da4ff3b3c6398e5f2cbb53ed8c7d402572e8 100644 (file)
@@ -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)