Merge branch 'common/mmcif' into rmobile-latest

1 files changed, 1 insertions, 4 deletions

diff --git a/arch/avr32/kernel/time.c b/arch/avr32/kernel/time.c
index 668ed2817e51..05ad29112ff4 100644
--- a/arch/avr32/kernel/time.c
+++ b/arch/avr32/kernel/time.c
@@ -35,7 +35,6 @@ static struct clocksource counter = {
         .rating         = 50,
         .read           = read_cycle_count,
         .mask           = CLOCKSOURCE_MASK(32),
-        .shift          = 16,
         .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -123,9 +122,7 @@ void __init time_init(void)
 
         /* figure rate for counter */
         counter_hz = clk_get_rate(boot_cpu_data.clk);
-        counter.mult = clocksource_hz2mult(counter_hz, counter.shift);
-
-        ret = clocksource_register(&counter);
+        ret = clocksource_register_hz(&counter, counter_hz);
         if (ret)
                 pr_debug("timer: could not register clocksource: %d\n", ret);