git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
[sfrench/cifs-2.6.git]
/
sound
/
soc
/
codecs
/
sn95031.c
diff --git
a/sound/soc/codecs/sn95031.c
b/sound/soc/codecs/sn95031.c
index f70977d7dbe61722a86a8de6478898d4b766ebba..84ffdebb8a8b9c937c9ffa1323f4de40f2874e81 100644
(file)
--- 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>