Merge branch 'core/rodata' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux...

[linux-2.6] / arch / mips / lasat / setup.c

diff --git a/arch/mips/lasat/setup.c b/arch/mips/lasat/setup.c
index 187e37821d9301fdfaf744f5f714de556714f887..e072da4ff3b3c6398e5f2cbb53ed8c7d402572e8 100644 (file)
--- a/arch/mips/lasat/setup.c
+++ b/arch/mips/lasat/setup.c
@@ -117,14 +117,11 @@ static struct notifier_block lasat_panic_block[] =
        }
 };
 
-static void lasat_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)
@@ -142,12 +139,8 @@ void __init plat_mem_setup(void)
 
        lasat_reboot_setup();
 
-       board_time_init = lasat_time_init;
-
 #ifdef CONFIG_DS1603
        ds1603 = &ds_defs[mips_machtype];
-       rtc_mips_get_time = ds1603_read;
-       rtc_mips_set_time = ds1603_set;
 #endif
 
 #ifdef DYNAMIC_SERIAL_INIT