diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-03-17 22:40:50 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-03-17 22:40:50 -0400 |
| commit | 688d794c4c3f8b08c814381ee2edd3ede5856056 (patch) | |
| tree | ef680add71e2a9588d07d8b594edbc1b5cd127d7 /include/linux/clockchips.h | |
| parent | 16142655269aaf580488e074eabfdcf0fb4e3687 (diff) | |
| parent | a937536b868b8369b98967929045f1df54234323 (diff) | |
Merge tag 'v3.9-rc3' into next
Merge with mainline to bring in module_platform_driver_probe() and
devm_ioremap_resource().
Diffstat (limited to 'include/linux/clockchips.h')
| -rw-r--r-- | include/linux/clockchips.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h index 8a7096fcb01e..66346521cb65 100644 --- a/include/linux/clockchips.h +++ b/include/linux/clockchips.h | |||
| @@ -161,6 +161,15 @@ clockevents_calc_mult_shift(struct clock_event_device *ce, u32 freq, u32 minsec) | |||
| 161 | extern void clockevents_suspend(void); | 161 | extern void clockevents_suspend(void); |
| 162 | extern void clockevents_resume(void); | 162 | extern void clockevents_resume(void); |
| 163 | 163 | ||
| 164 | #ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST | ||
| 165 | #ifdef CONFIG_ARCH_HAS_TICK_BROADCAST | ||
| 166 | extern void tick_broadcast(const struct cpumask *mask); | ||
| 167 | #else | ||
| 168 | #define tick_broadcast NULL | ||
| 169 | #endif | ||
| 170 | extern int tick_receive_broadcast(void); | ||
| 171 | #endif | ||
| 172 | |||
| 164 | #ifdef CONFIG_GENERIC_CLOCKEVENTS | 173 | #ifdef CONFIG_GENERIC_CLOCKEVENTS |
| 165 | extern void clockevents_notify(unsigned long reason, void *arg); | 174 | extern void clockevents_notify(unsigned long reason, void *arg); |
| 166 | #else | 175 | #else |