diff options
Diffstat (limited to 'arch/arm/mach-omap1')
-rw-r--r-- | arch/arm/mach-omap1/time.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c index 1be6a214d88d..abb34ff2041b 100644 --- a/arch/arm/mach-omap1/time.c +++ b/arch/arm/mach-omap1/time.c | |||
@@ -208,7 +208,6 @@ static struct clocksource clocksource_mpu = { | |||
208 | .rating = 300, | 208 | .rating = 300, |
209 | .read = mpu_read, | 209 | .read = mpu_read, |
210 | .mask = CLOCKSOURCE_MASK(32), | 210 | .mask = CLOCKSOURCE_MASK(32), |
211 | .shift = 24, | ||
212 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, | 211 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
213 | }; | 212 | }; |
214 | 213 | ||
@@ -217,13 +216,10 @@ static void __init omap_init_clocksource(unsigned long rate) | |||
217 | static char err[] __initdata = KERN_ERR | 216 | static char err[] __initdata = KERN_ERR |
218 | "%s: can't register clocksource!\n"; | 217 | "%s: can't register clocksource!\n"; |
219 | 218 | ||
220 | clocksource_mpu.mult | ||
221 | = clocksource_khz2mult(rate/1000, clocksource_mpu.shift); | ||
222 | |||
223 | setup_irq(INT_TIMER2, &omap_mpu_timer2_irq); | 219 | setup_irq(INT_TIMER2, &omap_mpu_timer2_irq); |
224 | omap_mpu_timer_start(1, ~0, 1); | 220 | omap_mpu_timer_start(1, ~0, 1); |
225 | 221 | ||
226 | if (clocksource_register(&clocksource_mpu)) | 222 | if (clocksource_register_hz(&clocksource_mpu, rate)) |
227 | printk(err, clocksource_mpu.name); | 223 | printk(err, clocksource_mpu.name); |
228 | } | 224 | } |
229 | 225 | ||