---

yaml --- r: 225822 b: refs/heads/master c: da79747 h: refs/heads/master v: v3
git-mirror · Dec 22, 2010 · 0075352 · 0075352
1 parent 5c5c05a
commit 0075352
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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);