git/linux-cryptodev-2.6
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git synced 2026-04-25 00:52:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'linus' into timers/core

Browse Source 
Make sure the upstream fixes are applied before adding further
modifications.
This commit is contained in:
Thomas Gleixner
2015-05-19 16:12:32 +02:00
parent daa67b4b70 e26081808e
commit c3b5d3cea5
3182 changed files with 109019 additions and 66067 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/clocksource.h
View File

@@ -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 */