From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sun, 27 Sep 2009 16:32:47 +0000 (+0100)
Subject: ARM: Fix SA11x0 clocksource warning
X-Git-Tag: firefly_0821_release~12222^2~18
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fac28e6df9b5fdfa0cf6b99eae022609dd1108d5;p=firefly-linux-kernel-4.4.55.git

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>
---

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 = {
 	.set_mode	= sa1100_osmr0_set_mode,
 };
 
-static cycle_t sa1100_read_oscr(void)
+static cycle_t sa1100_read_oscr(struct clocksource *s)
 {
 	return OSCR;
 }