---

yaml --- r: 225830 b: refs/heads/master c: 11e718a h: refs/heads/master v: v3
git-mirror · Dec 22, 2010 · 7de12c5 · 7de12c5
1 parent 1dcf090
commit 7de12c5
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: 2218543fe0c40ce36fa165c5003072cc8b236c34
+refs/heads/master: 11e718a6535c0c7a375b24c3ad60a98b988090c8
diff --git a/trunk/arch/arm/plat-versatile/timer-sp.c b/trunk/arch/arm/plat-versatile/timer-sp.c
@@ -46,7 +46,6 @@ static struct clocksource clocksource_sp804 = {
 	.rating		= 200,
 	.read		= sp804_read,
 	.mask		= CLOCKSOURCE_MASK(32),
-	.shift		= 20,
 	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -63,8 +62,7 @@ void __init sp804_clocksource_init(void __iomem *base)
 	writel(TIMER_CTRL_32BIT | TIMER_CTRL_ENABLE | TIMER_CTRL_PERIODIC,
 		clksrc_base + TIMER_CTRL);
 
-	cs->mult = clocksource_khz2mult(TIMER_FREQ_KHZ, cs->shift);
-	clocksource_register(cs);
+	clocksource_register_khz(cs, TIMER_FREQ_KHZ);
 }