diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
| commit | a56e74f546b64be93731e42d83baf5b538cc1b11 (patch) | |
| tree | 18f6dee45d801e57ac9db2a31664b0d5c0762c50 /include/linux/timex.h | |
| parent | d08e2e09042bd3f7ef66a35cb4bb92794ab26bb2 (diff) | |
| parent | e4e7f10bfc4069925e99cc4b428c3434e30b6c3f (diff) | |
Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable
Diffstat (limited to 'include/linux/timex.h')
| -rw-r--r-- | include/linux/timex.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/timex.h b/include/linux/timex.h index b3726e61368e..dd3edd7dfc94 100644 --- a/include/linux/timex.h +++ b/include/linux/timex.h | |||
| @@ -141,6 +141,7 @@ extern int do_adjtimex(struct timex *); | |||
| 141 | extern void hardpps(const struct timespec *, const struct timespec *); | 141 | extern void hardpps(const struct timespec *, const struct timespec *); |
| 142 | 142 | ||
| 143 | int read_current_timer(unsigned long *timer_val); | 143 | int read_current_timer(unsigned long *timer_val); |
| 144 | void ntp_notify_cmos_timer(void); | ||
| 144 | 145 | ||
| 145 | /* The clock frequency of the i8253/i8254 PIT */ | 146 | /* The clock frequency of the i8253/i8254 PIT */ |
| 146 | #define PIT_TICK_RATE 1193182ul | 147 | #define PIT_TICK_RATE 1193182ul |