summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Kochetkov <al.kochet@gmail.com>2017-03-22 17:32:49 +0300
committerDaniel Lezcano <daniel.lezcano@linaro.org>2017-03-28 10:39:49 +0300
commit07de36b378a58f1d1426829acf0ab7cf86f651f3 (patch)
tree3c4c3a07fc98b184716f478bc5fa16381102b57b
parent33d8c15559df4f0bce25d7e16ebb5879e249f2e7 (diff)
downloadlinux-07de36b378a58f1d1426829acf0ab7cf86f651f3.tar.xz
clockevents: Fix syntax error in clkevt-of macro
The patch fix syntax errors introduced by commit 0c8893c9095d ("clockevents: Add a clkevt-of mechanism like clksrc-of"). Fixes: 0c8893c9095d ("clockevents: Add a clkevt-of mechanism like clksrc-of") Signed-off-by: Alexander Kochetkov <al.kochet@gmail.com> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
-rw-r--r--drivers/clocksource/clkevt-probe.c2
-rw-r--r--include/linux/clockchips.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clocksource/clkevt-probe.c b/drivers/clocksource/clkevt-probe.c
index 8c30fec86094..eb89b502acbd 100644
--- a/drivers/clocksource/clkevt-probe.c
+++ b/drivers/clocksource/clkevt-probe.c
@@ -17,7 +17,7 @@
#include <linux/init.h>
#include <linux/of.h>
-#include <linux/clockchip.h>
+#include <linux/clockchips.h>
extern struct of_device_id __clkevt_of_table[];
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