From 3f64edc068ec60801da8c537b939e342a64b8f28 Mon Sep 17 00:00:00 2001
From: Coly Li <coly.li@suse.de>
Date: Thu, 23 Apr 2009 03:04:45 +0800
Subject: [PATCH] --- yaml --- r: 145392 b: refs/heads/master c:
 f5c81a327015844eb91087dd102648b5d984f33c h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/arm/mach-mmp/time.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c1a742599a05..362f26e94389 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e1b74df992c1ef92213ab26f952befda2087f59
+refs/heads/master: f5c81a327015844eb91087dd102648b5d984f33c
diff --git a/trunk/arch/arm/mach-mmp/time.c b/trunk/arch/arm/mach-mmp/time.c
index b03a6eda7419..a8400bb891e7 100644
--- a/trunk/arch/arm/mach-mmp/time.c
+++ b/trunk/arch/arm/mach-mmp/time.c
@@ -136,7 +136,7 @@ static struct clock_event_device ckevt = {
 	.set_mode	= timer_set_mode,
 };
 
-static cycle_t clksrc_read(void)
+static cycle_t clksrc_read(struct clocksource *cs)
 {
 	return timer_read();
 }