From 6f3062328950ee2d58332bf3a2b07e7c29ccf005 Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 13 Dec 2010 13:18:21 +0000 Subject: [PATCH] --- yaml --- r: 225815 b: refs/heads/master c: 4f9272bfe8fca7e6d9e2f44eb78fd2c3ecdf9a0e h: refs/heads/master i: 225813: 09566e797b4343f9227490982cb14805aa973723 225811: ffe7a4b71f46daeb2030ca597f5b24a062486911 225807: dac4ebacfc139cf697c30d7edfb571e4d2beb168 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-netx/time.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index cf7dca362388..86769e643133 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff9c9772480f06bc7164217b93ebb99fc088539f +refs/heads/master: 4f9272bfe8fca7e6d9e2f44eb78fd2c3ecdf9a0e diff --git a/trunk/arch/arm/mach-netx/time.c b/trunk/arch/arm/mach-netx/time.c index 82801dbf0579..f12f22d09b6c 100644 --- a/trunk/arch/arm/mach-netx/time.c +++ b/trunk/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);