Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kerne…

…l/git/tiwai/sound-2.6 into for-2.6.35
git-mirror · Mar 29, 2010 · e6ab07c · e6ab07c
2 parents cc780d3 + 923a004
commit e6ab07c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/sound/soc/codecs/ad193x.c b/sound/soc/codecs/ad193x.c
@@ -12,6 +12,7 @@
 #include <linux/device.h>
 #include <linux/i2c.h>
 #include <linux/spi/spi.h>
+#include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>

diff --git 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/codecs/twl6040.c b/sound/soc/codecs/twl6040.c
@@ -27,6 +27,7 @@
 #include <linux/i2c.h>
 #include <linux/gpio.h>
 #include <linux/platform_device.h>
+#include <linux/slab.h>
 #include <linux/i2c/twl.h>
 
 #include <sound/core.h>

diff --git 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>