mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 05:29:04 -04:00
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Thomas Gleixner: "Two small fixes for the new CLKEVT_OF infrastructure" * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: vmlinux.lds: Add __clkevt_of_table to kernel clockevents: Fix syntax error in clkevt-of macro
This commit is contained in:
commit
4a6808f347
3 changed files with 4 additions and 2 deletions
|
|
@ -229,7 +229,7 @@ static inline void tick_setup_hrtimer_broadcast(void) { }
|
|||
|
||||
#ifdef CONFIG_CLKEVT_PROBE
|
||||
extern int clockevent_probe(void);
|
||||
#els
|
||||
#else
|
||||
static inline int clockevent_probe(void) { return 0; }
|
||||
#endif
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue