Merge tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux-2.6

[firefly-linux-kernel-4.4.55.git] / include / linux / clocksource.h

diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index 081147da05642dbf98d53052e96f109301368910..fbe89e17124e9924bc3185e7a571d91bcada28f5 100644 (file)
--- 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,