diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-05-19 16:12:32 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-05-19 16:12:32 +0200 |
| commit | c3b5d3cea508d2c8ff493ef18c45a9cc58fb7015 (patch) | |
| tree | a80672ee82fcc3d9c8d486e53731eb19cd968eb0 /include/linux/clocksource.h | |
| parent | daa67b4b70568a07fef3cffacb2055891bf42ddb (diff) | |
| parent | e26081808edadfd257c6c9d81014e3b25e9a6118 (diff) | |
| download | op-kernel-dev-c3b5d3cea508d2c8ff493ef18c45a9cc58fb7015.zip op-kernel-dev-c3b5d3cea508d2c8ff493ef18c45a9cc58fb7015.tar.gz | |
Merge branch 'linus' into timers/core
Make sure the upstream fixes are applied before adding further
modifications.
Diffstat (limited to 'include/linux/clocksource.h')
| -rw-r--r-- | include/linux/clocksource.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index a25fc6e..278dd27 100644 --- 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 */ |
