diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-04 08:37:45 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-04 08:37:45 -0700 |
commit | d7c764c4c7b782c660b4600b0bff2e3509892a4d (patch) | |
tree | 94e7540f4996e15f717001eb08e21dd59c42c0fd /sound/soc | |
parent | 148086bb64694cc91624bab2a550d50f800eb4b7 (diff) | |
parent | 818987e9a19c52240ba9b1c20f28f047eef76072 (diff) | |
download | kernel_samsung_smdk4412-d7c764c4c7b782c660b4600b0bff2e3509892a4d.zip kernel_samsung_smdk4412-d7c764c4c7b782c660b4600b0bff2e3509892a4d.tar.gz kernel_samsung_smdk4412-d7c764c4c7b782c660b4600b0bff2e3509892a4d.tar.bz2 |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, UV: Fix kdump reboot
x86, amd-nb: Rename CPU PCI id define for F4
sound: Add delay.h to sound/soc/codecs/sn95031.c
x86, mtrr, pat: Fix one cpu getting out of sync during resume
x86, microcode: Unregister syscore_ops after microcode unloaded
x86: Stop including <linux/delay.h> in two asm header files
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/codecs/sn95031.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/sn95031.c b/sound/soc/codecs/sn95031.c index 2a30eae..a54d2a5 100644 --- a/sound/soc/codecs/sn95031.c +++ b/sound/soc/codecs/sn95031.c @@ -26,7 +26,9 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include <linux/platform_device.h> +#include <linux/delay.h> #include <linux/slab.h> + #include <asm/intel_scu_ipc.h> #include <sound/pcm.h> #include <sound/pcm_params.h> |