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

[mv-sheeva.git] / arch / arm / plat-mxc / time.c

diff --git a/arch/arm/plat-mxc/time.c b/arch/arm/plat-mxc/time.c
index f9a1b059a76cde1926f50758200c046f27685e7d..9f0c2610595ef5e282059e981278af5fdd0985fb 100644 (file)
--- a/arch/arm/plat-mxc/time.c
+++ b/arch/arm/plat-mxc/time.c
@@ -120,7 +120,6 @@ static struct clocksource clocksource_mxc = {
        .rating         = 200,
        .read           = mx1_2_get_cycles,
        .mask           = CLOCKSOURCE_MASK(32),
-       .shift          = 20,
        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -131,9 +130,7 @@ static int __init mxc_clocksource_init(struct clk *timer_clk)
        if (timer_is_v2())
                clocksource_mxc.read = v2_get_cycles;
 
-       clocksource_mxc.mult = clocksource_hz2mult(c,
-                                       clocksource_mxc.shift);
-       clocksource_register(&clocksource_mxc);
+       clocksource_register_hz(&clocksource_mxc, c);
 
        return 0;
 }