aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2009-09-27 12:32:47 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-09-28 13:06:19 -0400
commitfac28e6df9b5fdfa0cf6b99eae022609dd1108d5 (patch)
treeddd0dd0e2e05735d8b128392a9bc529d01838e4c
parent3f944ab115f64fefa2c8ae985aafe652179fce4f (diff)
ARM: Fix SA11x0 clocksource warning
8e19608 missed updating SA11x0, and thus: arch/arm/mach-sa1100/time.c:88: warning: initialization from incompatible pointer type Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-sa1100/time.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/time.c b/arch/arm/mach-sa1100/time.c
index 95d92e8e56a8..b9cbb56d6e9d 100644
--- a/arch/arm/mach-sa1100/time.c
+++ b/arch/arm/mach-sa1100/time.c
@@ -77,7 +77,7 @@ static struct clock_event_device ckevt_sa1100_osmr0 = {
77 .set_mode = sa1100_osmr0_set_mode, 77 .set_mode = sa1100_osmr0_set_mode,
78}; 78};
79 79
80static cycle_t sa1100_read_oscr(void) 80static cycle_t sa1100_read_oscr(struct clocksource *s)
81{ 81{
82 return OSCR; 82 return OSCR;
83} 83}