diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2012-05-22 04:30:39 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2012-05-22 04:30:39 -0400 |
| commit | b80fe1015be4e3c926d8eb4cc6a340fdd22a43e1 (patch) | |
| tree | 0576e6aa286d683bef6c8faf416451bb30a17707 /include/linux | |
| parent | 764e0da14fd7ac2d259d98d34ece0a87d32306c9 (diff) | |
| parent | d239f49d77ad9ffa442e700db3cab06d8b414cd1 (diff) | |
Merge branch 'fortglx/3.5/time' of git://git.linaro.org/people/jstultz/linux into timers/core
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/time.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/time.h b/include/linux/time.h index 33a92ead4d88..179f4d6755fc 100644 --- a/include/linux/time.h +++ b/include/linux/time.h | |||
| @@ -167,7 +167,6 @@ extern void get_monotonic_boottime(struct timespec *ts); | |||
| 167 | extern struct timespec timespec_trunc(struct timespec t, unsigned gran); | 167 | extern struct timespec timespec_trunc(struct timespec t, unsigned gran); |
| 168 | extern int timekeeping_valid_for_hres(void); | 168 | extern int timekeeping_valid_for_hres(void); |
| 169 | extern u64 timekeeping_max_deferment(void); | 169 | extern u64 timekeeping_max_deferment(void); |
| 170 | extern void timekeeping_leap_insert(int leapsecond); | ||
| 171 | extern int timekeeping_inject_offset(struct timespec *ts); | 170 | extern int timekeeping_inject_offset(struct timespec *ts); |
| 172 | 171 | ||
| 173 | struct tms; | 172 | struct tms; |