Skip to content

Commit

Permalink
ARM: Fix SA11x0 clocksource warning
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Russell King committed Sep 28, 2009
1 parent 3f944ab commit fac28e6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/arm/mach-sa1100/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit fac28e6

Please sign in to comment.