diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-27 17:32:47 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-28 18:06:19 +0100 |
| commit | fac28e6df9b5fdfa0cf6b99eae022609dd1108d5 (patch) | |
| tree | ddd0dd0e2e05735d8b128392a9bc529d01838e4c /arch | |
| parent | 3f944ab115f64fefa2c8ae985aafe652179fce4f (diff) | |
| download | linux-stable-fac28e6df9b5fdfa0cf6b99eae022609dd1108d5.tar.gz linux-stable-fac28e6df9b5fdfa0cf6b99eae022609dd1108d5.tar.bz2 linux-stable-fac28e6df9b5fdfa0cf6b99eae022609dd1108d5.zip | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-sa1100/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |