Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / avr32 / kernel / time.c

diff --git a/arch/avr32/kernel/time.c b/arch/avr32/kernel/time.c
index 668ed2817e51dfce0d6a94324ef95b8f59ddb639..05ad29112ff491f393bfda90cbfcd12fc9d8dfd6 100644 (file)
--- 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);