From: Coly Li <coly.li@suse.de>
Date: Wed, 22 Apr 2009 19:04:45 +0000 (+0800)
Subject: [ARM] pxa: add parameter to clksrc_read() for pxa168/910
X-Git-Tag: v2.6.30-rc8~15^2~6^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f5c81a327015844eb91087dd102648b5d984f33c;p=karo-tx-linux.git

[ARM] pxa: add parameter to clksrc_read() for pxa168/910

This patch modifies parameter of clksrc_read() from 'void' to
'struct clocksource *cs', which fixes compile warning for
incompatible parameter type.

Signed-off-by: Coly Li <coly.li@suse.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
---

diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c
index b03a6eda7419..a8400bb891e7 100644
--- a/arch/arm/mach-mmp/time.c
+++ b/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();
 }