Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / arch / mips / sni / time.c

diff --git a/arch/mips/sni/time.c b/arch/mips/sni/time.c
index 60bc62e..796e3ce 100644 (file)
--- a/arch/mips/sni/time.c
+++ b/arch/mips/sni/time.c
@@ -1,6 +1,7 @@
 #include <linux/types.h>
 #include <linux/interrupt.h>
 #include <linux/time.h>
+#include <linux/clockchips.h>
 
 #include <asm/i8253.h>
 #include <asm/sni.h>
@@ -80,7 +81,7 @@ static void __init sni_a20r_timer_setup(void)
        unsigned int cpu = smp_processor_id();
 
        cd->cpumask             = cpumask_of_cpu(cpu);
-
+       clockevents_register_device(cd);
        action->dev_id = cd;
        setup_irq(SNI_A20R_IRQ_TIMER, &a20r_irqaction);
 }
@@ -169,8 +170,6 @@ void __init plat_time_init(void)
 
        mips_hpt_frequency = r4k_tick * HZ;
 
-       setup_pit_timer();
-
        switch (sni_brd_type) {
        case SNI_BRD_10:
        case SNI_BRD_10NEW:
@@ -179,6 +178,7 @@ void __init plat_time_init(void)
                sni_a20r_timer_setup();
                break;
        }
+       setup_pit_timer();
 }
 
 unsigned long read_persistent_clock(void)