diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-18 19:12:18 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-18 19:12:56 (GMT) |
| commit | fd8957a96d535a992067b2c206672323a885454a (patch) | |
| tree | 136bedf882a14924f76f059977e40eda038ae5c9 /include/clocksource/arm_arch_timer.h | |
| parent | 3fbd55ec21e698221ffb43526090137b07c32586 (diff) | |
| parent | 3f71be237ce37e0131973ebfa33b326bc51d743e (diff) | |
| download | linux-fd8957a96d535a992067b2c206672323a885454a.tar.xz | |
Merge branch 'for-rmk/arch-timer-cleanups' of git://linux-arm.org/linux-mr into devel-stable
Please pull these arch_timer cleanups I've been holding onto for a while.
They're the same as my last posting [1], but have been rebased to v3.10-rc3.
[1] http://lists.infradead.org/pipermail/linux-arm-kernel/2013-May/170602.html
-- Mark Rutland
Diffstat (limited to 'include/clocksource/arm_arch_timer.h')
| -rw-r--r-- | include/clocksource/arm_arch_timer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/clocksource/arm_arch_timer.h b/include/clocksource/arm_arch_timer.h index e6c9c4c..c463ce9 100644 --- a/include/clocksource/arm_arch_timer.h +++ b/include/clocksource/arm_arch_timer.h @@ -32,7 +32,7 @@ #ifdef CONFIG_ARM_ARCH_TIMER extern u32 arch_timer_get_rate(void); -extern u64 (*arch_timer_read_counter)(void); +extern u64 arch_timer_read_counter(void); extern struct timecounter *arch_timer_get_timecounter(void); #else |