diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-03-27 10:09:21 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-03-27 10:09:21 +0100 |
| commit | 4e6d7c2aa95158315902647963b359b32da5c295 (patch) | |
| tree | 5141f79302e1e653cde53bab6a981a1b7bfa47b0 /arch/arm | |
| parent | 3c435c1e472ba344ee25f795f4807d4457e61f6c (diff) | |
| parent | fe5fba05b46c791c95a9f34228ac495f81f72fc0 (diff) | |
| download | lwn-4e6d7c2aa95158315902647963b359b32da5c295.tar.gz lwn-4e6d7c2aa95158315902647963b359b32da5c295.zip | |
Merge branch 'timers/core' into perf/timer, to apply dependent patch
An upcoming patch will depend on tai_ns() and NMI-safe ktime_get_raw_fast(),
so merge timers/core here in a separate topic branch until it's all cooked
and timers/core is merged upstream.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/plat-omap/counter_32k.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/counter_32k.c b/arch/arm/plat-omap/counter_32k.c index 61b4d705c267..43cf74561cfd 100644 --- a/arch/arm/plat-omap/counter_32k.c +++ b/arch/arm/plat-omap/counter_32k.c @@ -103,7 +103,7 @@ int __init omap_init_clocksource_32k(void __iomem *vbase) /* * 120000 rough estimate from the calculations in - * __clocksource_updatefreq_scale. + * __clocksource_update_freq_scale. */ clocks_calc_mult_shift(&persistent_mult, &persistent_shift, 32768, NSEC_PER_SEC, 120000); |