git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[pandora-kernel.git]
/
drivers
/
staging
/
intel_sst
/
intelmid_v2_control.c
diff --git
a/drivers/staging/intel_sst/intelmid_v2_control.c
b/drivers/staging/intel_sst/intelmid_v2_control.c
index
401a180
..
000378a
100644
(file)
--- a/
drivers/staging/intel_sst/intelmid_v2_control.c
+++ b/
drivers/staging/intel_sst/intelmid_v2_control.c
@@
-30,6
+30,7
@@
#include <linux/gpio.h>
#include <linux/pci.h>
+#include <linux/delay.h>
#include <linux/file.h>
#include <sound/control.h>
#include "intel_sst.h"