Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[cascardo/linux.git] / include / linux / timex.h

diff --git a/include/linux/timex.h b/include/linux/timex.h
index da4c32d..9d3f1a5 100644 (file)
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
@@ -155,6 +155,7 @@ extern int do_adjtimex(struct timex *);
 extern void hardpps(const struct timespec *, const struct timespec *);
 
 int read_current_timer(unsigned long *timer_val);
+void ntp_notify_cmos_timer(void);
 
 /* The clock frequency of the i8253/i8254 PIT */
 #define PIT_TICK_RATE 1193182ul