projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into timers/core
[cascardo/linux.git]
/
include
/
linux
/
clocksource.h
diff --git
a/include/linux/clocksource.h
b/include/linux/clocksource.h
index
a25fc6e
..
278dd27
100644
(file)
--- a/
include/linux/clocksource.h
+++ b/
include/linux/clocksource.h
@@
-252,4
+252,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 */