diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-06-20 12:35:36 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-06-20 12:35:36 +0200 |
| commit | e707eb762cf38b63402c1a124192f648a0629168 (patch) | |
| tree | 9e43adc72fbfb49b4287daade4e2be9da8622658 /include/linux/clockchips.h | |
| parent | 938e7cf2d569833a5acf689a8926faf507826253 (diff) | |
| parent | c477990295a78f1248283322bd1ad964c22151bc (diff) | |
Merge branch 'clockevents/4.13' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clockevent changes from Daniel Lezcano:
- Factored out moxart, aspeed, cortina drivers into a generic timer fttrm010.
Take the opportunity to add the delay timer (Linus Walleij)
- Saved / restored tcb atmel context at suspend/resume (Alexandre Belloni)
- Added ast2500 compatible string and fixed aspeed2500 initialization (Daniel
Lezcano)
- Added clock names property for aspeed (Andrew Jeffery)
- Renamed clocksource_of to timer_of (Daniel Lezcano)
- Added a common timer init routine (Daniel Lezcano)
Diffstat (limited to 'include/linux/clockchips.h')
| -rw-r--r-- | include/linux/clockchips.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h index acc9ce05e5f0..a116926598fd 100644 --- a/include/linux/clockchips.h +++ b/include/linux/clockchips.h @@ -223,13 +223,4 @@ static inline void tick_setup_hrtimer_broadcast(void) { } #endif /* !CONFIG_GENERIC_CLOCKEVENTS */ -#define CLOCKEVENT_OF_DECLARE(name, compat, fn) \ - OF_DECLARE_1_RET(clkevt, name, compat, fn) - -#ifdef CONFIG_CLKEVT_PROBE -extern int clockevent_probe(void); -#else -static inline int clockevent_probe(void) { return 0; } -#endif - #endif /* _LINUX_CLOCKCHIPS_H */ |