diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-04 11:37:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-04 11:37:45 -0400 |
| commit | d7c764c4c7b782c660b4600b0bff2e3509892a4d (patch) | |
| tree | 94e7540f4996e15f717001eb08e21dd59c42c0fd /sound/soc | |
| parent | 148086bb64694cc91624bab2a550d50f800eb4b7 (diff) | |
| parent | 818987e9a19c52240ba9b1c20f28f047eef76072 (diff) | |
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 2a30eae1881c..a54d2a5b28f6 100644 --- a/sound/soc/codecs/sn95031.c +++ b/sound/soc/codecs/sn95031.c | |||
| @@ -26,7 +26,9 @@ | |||
| 26 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | 26 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
| 27 | 27 | ||
| 28 | #include <linux/platform_device.h> | 28 | #include <linux/platform_device.h> |
| 29 | #include <linux/delay.h> | ||
| 29 | #include <linux/slab.h> | 30 | #include <linux/slab.h> |
| 31 | |||
| 30 | #include <asm/intel_scu_ipc.h> | 32 | #include <asm/intel_scu_ipc.h> |
| 31 | #include <sound/pcm.h> | 33 | #include <sound/pcm.h> |
| 32 | #include <sound/pcm_params.h> | 34 | #include <sound/pcm_params.h> |