diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-04-11 08:42:47 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-04-11 08:42:47 +0200 |
| commit | 84b1e36a6aee080ea01256659e2957114a0a52b5 (patch) | |
| tree | e105aceb0f5aac46dbed0cb86ec28656cce44f35 /include/linux/clockchips.h | |
| parent | 11e445e9b499dfd96d7cbc55b2f22057fcf2804d (diff) | |
| parent | 39da7c509acff13fc8cb12ec1bb20337c988ed36 (diff) | |
Merge tag 'v4.11-rc6' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/clockchips.h')
| -rw-r--r-- | include/linux/clockchips.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h index 5d3053c34fb3..6d7edc3082f9 100644 --- a/include/linux/clockchips.h +++ b/include/linux/clockchips.h @@ -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 |