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
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[sfrench/cifs-2.6.git]
/
sound
/
soc
/
davinci
/
davinci-mcasp.c
diff --git
a/sound/soc/davinci/davinci-mcasp.c
b/sound/soc/davinci/davinci-mcasp.c
index c056bfbe03407f8182beb8c487092379e6959bb0..79f0f4ad242c1be8bfb00694ff1e011016942f90 100644
(file)
--- a/
sound/soc/davinci/davinci-mcasp.c
+++ b/
sound/soc/davinci/davinci-mcasp.c
@@
-18,6
+18,7
@@
#include <linux/init.h>
#include <linux/module.h>
#include <linux/device.h>
+#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/io.h>
#include <linux/clk.h>