From 0075352e8c3d83a54f11eb1ac218f5146c6fdc7d Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 13 Dec 2010 13:19:55 +0000 Subject: [PATCH] --- yaml --- r: 225822 b: refs/heads/master c: da797478c1ba05a858c7719a02ce0856a5bb69ce h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-u300/timer.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e3208b757609..fd42d8a6998b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b46340a18e7552656097119d121b4b42049dde1 +refs/heads/master: da797478c1ba05a858c7719a02ce0856a5bb69ce diff --git a/trunk/arch/arm/mach-u300/timer.c b/trunk/arch/arm/mach-u300/timer.c index 3fc4472719be..377ff7ff9182 100644 --- a/trunk/arch/arm/mach-u300/timer.c +++ b/trunk/arch/arm/mach-u300/timer.c @@ -412,9 +412,7 @@ static void __init u300_timer_init(void) writel(U300_TIMER_APP_EGPT2_TIMER_ENABLE, U300_TIMER_APP_VBASE + U300_TIMER_APP_EGPT2); - clocksource_calc_mult_shift(&clocksource_u300_1mhz, - rate, APPTIMER_MIN_RANGE); - if (clocksource_register(&clocksource_u300_1mhz)) + if (clocksource_register_hz(&clocksource_u300_1mhz, rate)) printk(KERN_ERR "timer: failed to initialize clock " "source %s\n", clocksource_u300_1mhz.name);