Commit e6ab07ce authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'topic/asoc' of... 

Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.35
parents cc780d38 923a0042

sound/soc/codecs/ad193x.c

+1 −0
Original line number Diff line number Diff line
@@ -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>

sound/soc/codecs/cq93vc.c

+1 −0
Original line number Diff line number Diff line
@@ -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>

sound/soc/codecs/twl6040.c

100755 → 100644
+1 −0
Original line number Diff line number Diff line
@@ -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>

sound/soc/davinci/davinci-vcif.c

+1 −0
Original line number Diff line number Diff line
@@ -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>

CRA Git | Maintained and supported by SUSTech CRA and CCSE