diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-01-05 20:52:19 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-01-05 20:52:19 +0300 |
| commit | 2c82e8ea942dc80350a62a719159ea522e0758af (patch) | |
| tree | 25ee879a57832485fa2730e1d20d545208a85d2a /include/linux/timer.h | |
| parent | 7a0a87160a1dc09220ec485b31d0f82f687a053f (diff) | |
| parent | b762408d596c9c6861bf9b0d7208a63b1a4b4b8d (diff) | |
| download | linux-2c82e8ea942dc80350a62a719159ea522e0758af.tar.xz | |
Merge tag 'asoc-v4.16' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v4.16
Quite a big update here, mostly in new device support and some big
updates for older drivers too. The main core work continues to be
Morimoto-san's efforts on modernising drivers to use the component
layer.
- Lots more updates from Morimoto-san to move more things into the
component level.
- Large cleanups of some of the TI CODEC drivers from Andrew F. Davis.
- Even more quirks and cleanups of quirks for x86 systems.
- Refactoring of the Freescale SSI driver from Nicolin Chen in
preparation for some more substantive improvements which are
currently in review.
- New drivers for Allwinner A83T, Maxim MAX89373, SocioNext UiniPhier
EVEA Tempo Semiconductor TSCS42xx and TI PCM816x, TAS5722 and TAS6424
devices.
Diffstat (limited to 'include/linux/timer.h')
| -rw-r--r-- | include/linux/timer.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/timer.h b/include/linux/timer.h index 04af640ea95b..2448f9cc48a3 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -207,9 +207,11 @@ unsigned long round_jiffies_up(unsigned long j); unsigned long round_jiffies_up_relative(unsigned long j); #ifdef CONFIG_HOTPLUG_CPU +int timers_prepare_cpu(unsigned int cpu); int timers_dead_cpu(unsigned int cpu); #else -#define timers_dead_cpu NULL +#define timers_prepare_cpu NULL +#define timers_dead_cpu NULL #endif #endif |