Merge branch 'clksrc' into devel

Conflicts:
	arch/arm/mach-vexpress/v2m.c
	arch/arm/plat-omap/counter_32k.c
	arch/arm/plat-versatile/Makefile

1 files changed, 2 insertions, 5 deletions

diff --git a/arch/arm/mach-davinci/time.c b/arch/arm/mach-davinci/time.c
index 0f21c36e65dd..c1486716de77 100644
--- a/arch/arm/mach-davinci/time.c
+++ b/arch/arm/mach-davinci/time.c
@@ -276,7 +276,6 @@ static struct clocksource clocksource_davinci = {
         .rating         = 300,
         .read           = read_cycles,
         .mask           = CLOCKSOURCE_MASK(32),
-        .shift          = 24,
         .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -378,10 +377,8 @@ static void __init davinci_timer_init(void)
 
         /* setup clocksource */
         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 */