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 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc
[sfrench/cifs-2.6.git]
/
sound
/
soc
/
pxa
/
pxa-ssp.c
diff --git
a/sound/soc/pxa/pxa-ssp.c
b/sound/soc/pxa/pxa-ssp.c
index 9e95e5117c88f8c6a95cbfe25e60cd66f22c92e2..d5fc52d0a3c4127a526d07de96bdaaf8ecdbe1e1 100644
(file)
--- a/
sound/soc/pxa/pxa-ssp.c
+++ b/
sound/soc/pxa/pxa-ssp.c
@@
-16,6
+16,7
@@
#include <linux/init.h>
#include <linux/module.h>
+#include <linux/slab.h>
#include <linux/platform_device.h>
#include <linux/clk.h>
#include <linux/io.h>