diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-05-24 02:05:51 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2014-05-24 02:05:51 +0200 |
| commit | 309179fabddd074f7da63c5602bc32cb6de677f9 (patch) | |
| tree | ddefd2f4b14df480070ee416fcc53f6b82ec7b35 /include | |
| parent | timer_stats/doc: Fix /proc/timer_stats documentation (diff) | |
| parent | ntp: Make is_error_status() use its argument (diff) | |
| download | linux-309179fabddd074f7da63c5602bc32cb6de677f9.tar.xz linux-309179fabddd074f7da63c5602bc32cb6de677f9.zip | |
Merge branch 'fortglx/3.16/time' of git://git.linaro.org/people/john.stultz/linux into timers/core
* Remove the deprecated setup_sched_clock() API
* Minor NTP updates
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/sched_clock.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/sched_clock.h b/include/linux/sched_clock.h index cddf0c2940b6..efa931c5cef1 100644 --- a/include/linux/sched_clock.h +++ b/include/linux/sched_clock.h @@ -14,7 +14,6 @@ extern void sched_clock_postinit(void); static inline void sched_clock_postinit(void) { } #endif -extern void setup_sched_clock(u32 (*read)(void), int bits, unsigned long rate); extern void sched_clock_register(u64 (*read)(void), int bits, unsigned long rate); |