Commit fac28e6d authored by Russell King's avatar Russell King

ARM: Fix SA11x0 clocksource warning

8e19608e missed updating SA11x0, and thus:

arch/arm/mach-sa1100/time.c:88: warning: initialization from incompatible pointer type
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 3f944ab1
...@@ -77,7 +77,7 @@ static struct clock_event_device ckevt_sa1100_osmr0 = { ...@@ -77,7 +77,7 @@ static struct clock_event_device ckevt_sa1100_osmr0 = {
.set_mode = sa1100_osmr0_set_mode, .set_mode = sa1100_osmr0_set_mode,
}; };
static cycle_t sa1100_read_oscr(void) static cycle_t sa1100_read_oscr(struct clocksource *s)
{ {
return OSCR; return OSCR;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment