diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2012-02-15 20:28:08 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2012-02-15 20:28:08 +0100 |
| commit | 9b612fa627105af2738d9205554e2a6dc8d32228 (patch) | |
| tree | da3e60aa309615a3e9f058b0cafcc87352cdfede /include/linux | |
| parent | 0a8a2e78b7eece7c65884fcff9f98dc0fce89ee4 (diff) | |
| parent | b519508298e0292e1771eecf14aaf67755adc39d (diff) | |
Merge branch 'fortglx/3.4/clocksource' of git://git.linaro.org/people/jstultz/linux into timers/core
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/clocksource.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index 081147da0564..fbe89e17124e 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h @@ -319,13 +319,6 @@ static inline void __clocksource_updatefreq_khz(struct clocksource *cs, u32 khz) __clocksource_updatefreq_scale(cs, 1000, khz); } -static inline void -clocksource_calc_mult_shift(struct clocksource *cs, u32 freq, u32 minsec) -{ - return clocks_calc_mult_shift(&cs->mult, &cs->shift, freq, - NSEC_PER_SEC, minsec); -} - #ifdef CONFIG_GENERIC_TIME_VSYSCALL extern void update_vsyscall(struct timespec *ts, struct timespec *wtm, |