projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
clocksource.h
diff --git
a/include/linux/clocksource.h
b/include/linux/clocksource.h
index 135509821c3994f4083bd2f0eb8f7c05409c026c..d27d0152271f9e8b487a48a9f2d74f51fe9a58a5 100644
(file)
--- a/
include/linux/clocksource.h
+++ b/
include/linux/clocksource.h
@@
-253,4
+253,10
@@
extern void clocksource_of_init(void);
static inline void clocksource_of_init(void) {}
#endif
+#ifdef CONFIG_ACPI
+void acpi_generic_timer_init(void);
+#else
+static inline void acpi_generic_timer_init(void) { }
+#endif
+
#endif /* _LINUX_CLOCKSOURCE_H */