Merge git://git.infradead.org/battery-2.6

[pandora-kernel.git] / arch / mips / sibyte / bcm1480 / smp.c

diff --git a/arch/mips/sibyte/bcm1480/smp.c b/arch/mips/sibyte/bcm1480/smp.c
index 584a4b3..02b266a 100644 (file)
--- a/arch/mips/sibyte/bcm1480/smp.c
+++ b/arch/mips/sibyte/bcm1480/smp.c
@@ -69,8 +69,9 @@ void bcm1480_smp_init(void)
 
 void bcm1480_smp_finish(void)
 {
-       extern void bcm1480_time_init(void);
-       bcm1480_time_init();
+       extern void sb1480_clockevent_init(void);
+
+       sb1480_clockevent_init();
        local_irq_enable();
 }
 
@@ -88,7 +89,7 @@ void core_send_ipi(int cpu, unsigned int action)
        __raw_writeq((((u64)action)<< 48), mailbox_0_set_regs[cpu]);
 }
 
-void bcm1480_mailbox_interrupt(struct pt_regs *regs)
+void bcm1480_mailbox_interrupt(void)
 {
        int cpu = smp_processor_id();
        unsigned int action;