summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorColy Li <coly.li@suse.de>2009-04-23 03:04:45 +0800
committerEric Miao <eric.miao@marvell.com>2009-05-22 18:15:49 +0800
commitf5c81a327015844eb91087dd102648b5d984f33c (patch)
tree0de8d9dec45e3221ccbd8912a315721ba413a723 /arch/arm
parent0e1b74df992c1ef92213ab26f952befda2087f59 (diff)
downloadop-kernel-dev-f5c81a327015844eb91087dd102648b5d984f33c.zip
op-kernel-dev-f5c81a327015844eb91087dd102648b5d984f33c.tar.gz
[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>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-mmp/time.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c
index b03a6ed..a8400bb 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();
}
OpenPOWER on IntegriCloud