From ffe7a4b71f46daeb2030ca597f5b24a062486911 Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 13 Dec 2010 13:17:40 +0000 Subject: [PATCH] --- yaml --- r: 225811 b: refs/heads/master c: b7c7c50adcf0d9c901542c5db8d795fe226bb454 h: refs/heads/master i: 225809: ccb297d3040307e460fc3871f33d00f6beb1db04 225807: dac4ebacfc139cf697c30d7edfb571e4d2beb168 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-ixp4xx/common.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index a9fbbf1de1b6..5a6b07aa4945 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 08963dab7c6b0ba6a687cb008299eabbbeff7282 +refs/heads/master: b7c7c50adcf0d9c901542c5db8d795fe226bb454 diff --git a/trunk/arch/arm/mach-ixp4xx/common.c b/trunk/arch/arm/mach-ixp4xx/common.c index 0bce09799d18..82fc003aae8b 100644 --- a/trunk/arch/arm/mach-ixp4xx/common.c +++ b/trunk/arch/arm/mach-ixp4xx/common.c @@ -411,7 +411,6 @@ static struct clocksource clocksource_ixp4xx = { .rating = 200, .read = ixp4xx_get_cycles, .mask = CLOCKSOURCE_MASK(32), - .shift = 20, .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; @@ -419,10 +418,7 @@ unsigned long ixp4xx_timer_freq = FREQ; EXPORT_SYMBOL(ixp4xx_timer_freq); static void __init ixp4xx_clocksource_init(void) { - clocksource_ixp4xx.mult = - clocksource_hz2mult(ixp4xx_timer_freq, - clocksource_ixp4xx.shift); - clocksource_register(&clocksource_ixp4xx); + clocksource_register_hz(&clocksource_ixp4xx, ixp4xx_timer_freq); } /*