---

yaml --- r: 144150 b: refs/heads/master c: f57f2fe h: refs/heads/master v: v3
git-mirror · Apr 23, 2009 · 066ccff · 066ccff
1 parent 02a6cab
commit 066ccff
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 993ce24078eac1442078741cd204584b63de0881
+refs/heads/master: f57f2fe2a39338c47b67fbd564a9d3b7587bcbee
diff --git a/trunk/arch/microblaze/kernel/timer.c b/trunk/arch/microblaze/kernel/timer.c
@@ -176,7 +176,7 @@ static __init void microblaze_clockevent_init(void)
 	clockevents_register_device(&clockevent_microblaze_timer);
 }
 
-static cycle_t microblaze_read(void)
+static cycle_t microblaze_read(struct clocksource *cs)
 {
 	/* reading actual value of timer 1 */
 	return (cycle_t) (in_be32(TIMER_BASE + TCR1));