diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-29 21:29:26 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-29 21:29:26 +0200 |
| commit | eae4653e1d11676f3505ac8d0c80f73830a8f6a1 (patch) | |
| tree | 56ba8f95132f5e0f59fa0390832f70f5848ac976 | |
| parent | 99cd64bd2dbf50b4c6193e31434f019fd5561a88 (diff) | |
| parent | 923a00427a141a6d1c83f1b151221a2458b2de8d (diff) | |
Merge branch 'topic/asoc' into for-next
| -rw-r--r-- | sound/soc/codecs/cq93vc.c | 1 | ||||
| -rw-r--r-- | sound/soc/davinci/davinci-vcif.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/cq93vc.c b/sound/soc/codecs/cq93vc.c index 513297441369..8f19b9310645 100644 --- a/sound/soc/codecs/cq93vc.c +++ b/sound/soc/codecs/cq93vc.c @@ -27,6 +27,7 @@ #include <linux/pm.h> #include <linux/platform_device.h> #include <linux/device.h> +#include <linux/slab.h> #include <linux/clk.h> #include <linux/mfd/davinci_voicecodec.h> diff --git a/sound/soc/davinci/davinci-vcif.c b/sound/soc/davinci/davinci-vcif.c index 54b91e1768c4..9aa980d38231 100644 --- a/sound/soc/davinci/davinci-vcif.c +++ b/sound/soc/davinci/davinci-vcif.c @@ -24,6 +24,7 @@ #include <linux/module.h> #include <linux/device.h> #include <linux/delay.h> +#include <linux/slab.h> #include <linux/io.h> #include <linux/mfd/davinci_voicecodec.h> |