---

yaml --- r: 225819 b: refs/heads/master c: 71c8745 h: refs/heads/master i: 225817: c4a99aa 225815: 6f30623 v: v3
git-mirror · Dec 22, 2010 · 02712a4 · 02712a4
1 parent 8620590
commit 02712a4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f62ae0ce4369effc432ea25df09c88d7aa08965e
+refs/heads/master: 71c874529904818a2888a650425369e0842ff28d
diff --git a/trunk/arch/arm/mach-s5pv310/time.c b/trunk/arch/arm/mach-s5pv310/time.c
@@ -211,7 +211,6 @@ struct clocksource pwm_clocksource = {
 	.rating		= 250,
 	.read		= s5pv310_pwm4_read,
 	.mask		= CLOCKSOURCE_MASK(32),
-	.shift		= 20,
 	.flags		= CLOCK_SOURCE_IS_CONTINUOUS ,
 };
 
@@ -230,10 +229,7 @@ static void __init s5pv310_clocksource_init(void)
 	s5pv310_pwm_init(4, ~0);
 	s5pv310_pwm_start(4, 1);
 
-	pwm_clocksource.mult =
-		clocksource_khz2mult(clock_rate/1000, pwm_clocksource.shift);
-
-	if (clocksource_register(&pwm_clocksource))
+	if (clocksource_register_hz(&pwm_clocksource, clock_rate))
 		panic("%s: can't register clocksource\n", pwm_clocksource.name);
 }