commit fac28e6df9b5fdfa0cf6b99eae022609dd1108d5
author Russell King <rmk+kernel@arm.linux.org.uk> Sun Sep 27 17:32:47 2009 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Mon Sep 28 18:06:19 2009 +0100
tree ddd0dd0e2e05735d8b128392a9bc529d01838e4c
parent 3f944ab115f64fefa2c8ae985aafe652179fce4f

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>

arch/arm/mach-sa1100/time.c

diff --git a/arch/arm/mach-sa1100/time.c b/arch/arm/mach-sa1100/time.c
index 95d92e8..b9cbb56 100644
--- a/arch/arm/mach-sa1100/time.c
+++ b/arch/arm/mach-sa1100/time.c
@@ -77,7 +77,7 @@
 	.set_mode	= sa1100_osmr0_set_mode,
 };
 
-static cycle_t sa1100_read_oscr(void)
+static cycle_t sa1100_read_oscr(struct clocksource *s)
 {
 	return OSCR;
 }