diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-05-29 06:52:16 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-05-29 06:52:16 -0400 |
| commit | 8a90bb5116889e98008fbc8178fc2a77bb51df4a (patch) | |
| tree | 210b6755c9ae2d0d66a79f8696469ab50b7621ad /include/linux/printk.h | |
| parent | d47333ddb234dbc661ab2a4fe019758bd33ba33b (diff) | |
| parent | 1ab9ecc24819a8cf8ee982aaf6fb83298f094b0d (diff) | |
Merge tag 'asoc-v3.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v3.10
A series of driver specific updates, none particularly critical, plus
one fix to the compressed API code to handle capture streams properly
which is very safe for mainline as there's no current users.
Diffstat (limited to 'include/linux/printk.h')
| -rw-r--r-- | include/linux/printk.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/printk.h b/include/linux/printk.h index 6af944ab38f0..22c7052e9372 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | #include <stdarg.h> | 4 | #include <stdarg.h> |
| 5 | #include <linux/init.h> | 5 | #include <linux/init.h> |
| 6 | #include <linux/kern_levels.h> | 6 | #include <linux/kern_levels.h> |
| 7 | #include <linux/linkage.h> | ||
| 7 | 8 | ||
| 8 | extern const char linux_banner[]; | 9 | extern const char linux_banner[]; |
| 9 | extern const char linux_proc_banner[]; | 10 | extern const char linux_proc_banner[]; |