Merge branch 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek...

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

diff --git a/arch/arm/mach-davinci/time.c b/arch/arm/mach-davinci/time.c
index 5d1eea0..e1969ce 100644 (file)
--- a/arch/arm/mach-davinci/time.c
+++ b/arch/arm/mach-davinci/time.c
@@ -286,7 +286,6 @@ static struct clocksource clocksource_davinci = {
        .rating         = 300,
        .read           = read_dummy,
        .mask           = CLOCKSOURCE_MASK(32),
-       .shift          = 24,
        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -400,10 +399,8 @@ static void __init davinci_timer_init(void)
        /* setup clocksource */
        clocksource_davinci.read = read_cycles;
        clocksource_davinci.name = id_to_name[clocksource_id];
-       clocksource_davinci.mult =
-               clocksource_khz2mult(davinci_clock_tick_rate/1000,
-                                    clocksource_davinci.shift);
-       if (clocksource_register(&clocksource_davinci))
+       if (clocksource_register_hz(&clocksource_davinci,
+                                   davinci_clock_tick_rate))
                printk(err, clocksource_davinci.name);
 
        /* setup clockevent */