projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3f944ab)
ARM: Fix SA11x0 clocksource warning
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 27 Sep 2009 16:32:47 +0000 (17:32 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 28 Sep 2009 17:06:19 +0000 (18:06 +0100)
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 patch | blob | blame | history

diff --git a/arch/arm/mach-sa1100/time.c b/arch/arm/mach-sa1100/time.c
index 95d92e8e56a81c820979d373cd87e4d152b09235..b9cbb56d6e9d9dbd9c7605196488b0872fd8bc4d 100644 (file)
--- 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;
 }