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

[mv-sheeva.git] / arch / arm / mach-tcc8k / time.c

diff --git a/arch/arm/mach-tcc8k/time.c b/arch/arm/mach-tcc8k/time.c
index 78d06008841d87adda56524b0b101555097ce55d..e0a8d609afe1d1a6d66c97ac4c882468961465f4 100644 (file)
--- a/arch/arm/mach-tcc8k/time.c
+++ b/arch/arm/mach-tcc8k/time.c
@@ -35,7 +35,6 @@ static struct clocksource clocksource_tcc = {
        .rating         = 200,
        .read           = tcc_get_cycles,
        .mask           = CLOCKSOURCE_MASK(32),
-       .shift          = 28,
        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -103,9 +102,7 @@ static int __init tcc_clockevent_init(struct clk *clock)
 {
        unsigned int c = clk_get_rate(clock);
 
-       clocksource_tcc.mult = clocksource_hz2mult(c,
-                                       clocksource_tcc.shift);
-       clocksource_register(&clocksource_tcc);
+       clocksource_register_hz(&clocksource_tcc, c);
 
        clockevent_tcc.mult = div_sc(c, NSEC_PER_SEC,
                                        clockevent_tcc.shift);