Merge branch 'fortglx/3.3/tip/timers/core' of git://git.linaro.org/people/jstultz/linux into timers/core

1 files changed, 1 insertions, 3 deletions

diff --git a/arch/cris/arch-v32/kernel/time.c b/arch/cris/arch-v32/kernel/time.c
index bb978ede8985..6773fc83a670 100644
--- a/arch/cris/arch-v32/kernel/time.c
+++ b/arch/cris/arch-v32/kernel/time.c
@@ -47,14 +47,12 @@ static struct clocksource cont_rotime = {
         .rating = 300,
         .read   = read_cont_rotime,
         .mask   = CLOCKSOURCE_MASK(32),
-        .shift  = 10,
         .flags  = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
 static int __init etrax_init_cont_rotime(void)
 {
-        cont_rotime.mult = clocksource_khz2mult(100000, cont_rotime.shift);
-        clocksource_register(&cont_rotime);
+        clocksource_register_khz(&cont_rotime, 100000);
         return 0;
 }
 arch_initcall(etrax_init_cont_rotime);