git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/asoc' into for-linus
[safe/jmp/linux-2.6]
/
sound
/
soc
/
soc-dapm.c
diff --git
a/sound/soc/soc-dapm.c
b/sound/soc/soc-dapm.c
index
fefb6c4
..
03cb7c0
100644
(file)
--- a/
sound/soc/soc-dapm.c
+++ b/
sound/soc/soc-dapm.c
@@
-38,6
+38,7
@@
#include <linux/platform_device.h>
#include <linux/jiffies.h>
#include <linux/debugfs.h>
+#include <linux/slab.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>