---

yaml --- r: 277423 b: refs/heads/master c: 63e4963 h: refs/heads/master i: 277421: f1169d5 277419: 11bc8e8 277415: 67d9ecf 277407: 6f115b4 v: v3
git-mirror · Nov 22, 2011 · 3d45964 · 3d45964
1 parent 4636aec
commit 3d45964
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: 010f3f1692b22f8ddabdccc6526915e181e49447
+refs/heads/master: 63e496340f07b58925f690451c93171d9b04fe1e
diff --git a/trunk/arch/parisc/kernel/time.c b/trunk/arch/parisc/kernel/time.c
@@ -198,8 +198,6 @@ static struct clocksource clocksource_cr16 = {
 	.rating			= 300,
 	.read			= read_cr16,
 	.mask			= CLOCKSOURCE_MASK(BITS_PER_LONG),
-	.mult			= 0, /* to be set */
-	.shift			= 22,
 	.flags			= CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -270,7 +268,5 @@ void __init time_init(void)
 
 	/* register at clocksource framework */
 	current_cr16_khz = PAGE0->mem_10msec/10;  /* kHz */
-	clocksource_cr16.mult = clocksource_khz2mult(current_cr16_khz,
-						clocksource_cr16.shift);
-	clocksource_register(&clocksource_cr16);
+	clocksource_register_khz(&clocksource_cr16, current_cr16_khz);
 }