Merge branch 'stable/platform-pci-fixes' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / arch / arm / mach-omap1 / time.c

diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c
index 7f75bc6..ed7a61f 100644 (file)
--- a/arch/arm/mach-omap1/time.c
+++ b/arch/arm/mach-omap1/time.c
@@ -209,7 +209,6 @@ static struct clocksource clocksource_mpu = {
        .rating         = 300,
        .read           = mpu_read,
        .mask           = CLOCKSOURCE_MASK(32),
-       .shift          = 24,
        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -218,13 +217,10 @@ static void __init omap_init_clocksource(unsigned long rate)
        static char err[] __initdata = KERN_ERR
                        "%s: can't register clocksource!\n";
 
-       clocksource_mpu.mult
-               = clocksource_khz2mult(rate/1000, clocksource_mpu.shift);
-
        setup_irq(INT_TIMER2, &omap_mpu_timer2_irq);
        omap_mpu_timer_start(1, ~0, 1);
 
-       if (clocksource_register(&clocksource_mpu))
+       if (clocksource_register_hz(&clocksource_mpu, rate))
                printk(err, clocksource_mpu.name);
 }