summaryrefslogtreecommitdiff
path: root/include/linux/clockchips.h
diff options
context:
space:
mode:
authorDoug Ledford <dledford@redhat.com>2017-07-17 18:26:58 +0300
committerDoug Ledford <dledford@redhat.com>2017-07-17 18:26:58 +0300
commit3d886aa3be15439e05784ac1cbd4acc2f13c0048 (patch)
tree5d7d5943c7f6697e640bdd684a560e9af7942300 /include/linux/clockchips.h
parentb6ea01ba3fe9dcb5e08bbd9ed482845582a1e80b (diff)
parent5771a8c08880cdca3bfb4a3fc6d309d6bba20877 (diff)
downloadlinux-3d886aa3be15439e05784ac1cbd4acc2f13c0048.tar.xz
Merge tag 'v4.13-rc1' into k.o/for-4.13-rc
Linux v4.13-rc1
Diffstat (limited to 'include/linux/clockchips.h')
-rw-r--r--include/linux/clockchips.h9
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 */