From 066ccff29b4e48aaa0df36869bf5dff0b10b2b3e Mon Sep 17 00:00:00 2001
From: Coly Li <coly.li@suse.de>
Date: Thu, 23 Apr 2009 03:05:31 +0800
Subject: [PATCH] --- yaml --- r: 144150 b: refs/heads/master c:
 f57f2fe2a39338c47b67fbd564a9d3b7587bcbee h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/arch/microblaze/kernel/timer.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5f8e9e6de4fc..9947293e833b 100644
--- 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
index 05a497eefd78..bdfa2f9f0c81 100644
--- 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));