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-netx / time.c

diff --git a/arch/arm/mach-netx/time.c b/arch/arm/mach-netx/time.c
index 82801dbf0579a024cb7a5df294db3105eaf1a464..f12f22d09b6c7ba157b6aa8de79918cdde76e74e 100644 (file)
--- a/arch/arm/mach-netx/time.c
+++ b/arch/arm/mach-netx/time.c
@@ -114,7 +114,6 @@ static struct clocksource clocksource_netx = {
        .rating         = 200,
        .read           = netx_get_cycles,
        .mask           = CLOCKSOURCE_MASK(32),
-       .shift          = 20,
        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -151,9 +150,7 @@ static void __init netx_timer_init(void)
        writel(NETX_GPIO_COUNTER_CTRL_RUN,
                        NETX_GPIO_COUNTER_CTRL(TIMER_CLOCKSOURCE));
 
-       clocksource_netx.mult =
-               clocksource_hz2mult(CLOCK_TICK_RATE, clocksource_netx.shift);
-       clocksource_register(&clocksource_netx);
+       clocksource_register_hz(&clocksource_netx, CLOCK_TICK_RATE);
 
        netx_clockevent.mult = div_sc(CLOCK_TICK_RATE, NSEC_PER_SEC,
                        netx_clockevent.shift);