summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordmitry pervushin <dpervushin@embeddedalley.com>2009-05-03 17:49:26 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-05-07 16:25:57 +0200
commitb4380b8e5888e5ef5872e43b610c9dac4bf253ac (patch)
treefde36e3174592a77d8a50ebd363d1868910ed67a
parent[ARM] 5483/1: Freescale STMP: add Kconfig/Makefile entries (diff)
downloadlinux-b4380b8e5888e5ef5872e43b610c9dac4bf253ac.tar.xz
linux-b4380b8e5888e5ef5872e43b610c9dac4bf253ac.zip
[ARM] 5501/1: Freescale STMP: fix compilation warning
To avoid compile-time warning, added parameter to the stmp3xxx_clock_read Signed-off-by: dmitry pervushin <dpervushin@embeddedalley.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/plat-stmp3xxx/timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-stmp3xxx/timer.c b/arch/arm/plat-stmp3xxx/timer.c
index c916068f0cab..7d872f0aee70 100644
--- a/arch/arm/plat-stmp3xxx/timer.c
+++ b/arch/arm/plat-stmp3xxx/timer.c
@@ -45,7 +45,7 @@ stmp3xxx_timer_interrupt(int irq, void *dev_id)
return IRQ_HANDLED;
}
-static cycle_t stmp3xxx_clock_read(void)
+static cycle_t stmp3xxx_clock_read(struct clocksource *cs)
{
return ~((HW_TIMROT_TIMCOUNTn_RD(1) & 0xFFFF0000) >> 16);
}