From 803050f5520c697e7895605e49e6b547df284440 Mon Sep 17 00:00:00 2001 From: Yong Zhang Date: Thu, 1 Dec 2011 11:25:59 -0800 Subject: [PATCH] --- yaml --- r: 288777 b: refs/heads/master c: c7f798e3722610d486e951f04bbc00b6ba124d62 h: refs/heads/master i: 288775: b8ef35680529ddb941e1a5161503950d3cf745fe v: v3 --- [refs] | 2 +- trunk/include/linux/clocksource.h | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index f7035e3588cc..8e9a6505d9f3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 13f0f030fb9d52c7fd48f3e6a2fe9ab0123875da +refs/heads/master: c7f798e3722610d486e951f04bbc00b6ba124d62 diff --git a/trunk/include/linux/clocksource.h b/trunk/include/linux/clocksource.h index 081147da0564..fbe89e17124e 100644 --- a/trunk/include/linux/clocksource.h +++ b/trunk/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,