From: Mark Brown <broonie@linaro.org>
Date: Tue, 11 Mar 2014 09:58:55 +0000 (+0000)
Subject: Merge branches 'topic/ad193x', 'topic/tlv320aic23', 'topic/tlv320aic32x4', 'topic... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=db5a5ee7c7b20a1780f90c6f2b8de322844b6fe9;p=linux-beck.git

Merge branches 'topic/ad193x', 'topic/tlv320aic23', 'topic/tlv320aic32x4', 'topic/wm8991', 'fix/si476x' and 'fix/88pm860' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-io
---

db5a5ee7c7b20a1780f90c6f2b8de322844b6fe9
diff --cc sound/soc/codecs/Makefile
index bc126764a44d,7795e37d313f,ed1fd8925e43,1deeb20fd411,bc126764a44d,bc126764a44d,bc126764a44d..bfda5c60932a
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@@@@@@@ -63,9 -65,9 -63,11 -63,9 -63,9 -63,9 -63,9 +65,11 @@@@@@@@ snd-soc-sta529-objs := sta529.
       snd-soc-stac9766-objs := stac9766.o
       snd-soc-tas5086-objs := tas5086.o
       snd-soc-tlv320aic23-objs := tlv320aic23.o
++ ++++snd-soc-tlv320aic23-i2c-objs := tlv320aic23-i2c.o
++ ++++snd-soc-tlv320aic23-spi-objs := tlv320aic23-spi.o
       snd-soc-tlv320aic26-objs := tlv320aic26.o
--- ---snd-soc-tlv320aic3x-objs := tlv320aic3x.o
       snd-soc-tlv320aic32x4-objs := tlv320aic32x4.o
+++ +++snd-soc-tlv320aic3x-objs := tlv320aic3x.o
       snd-soc-tlv320dac33-objs := tlv320dac33.o
       snd-soc-twl4030-objs := twl4030.o
       snd-soc-twl6040-objs := twl6040.o
@@@@@@@@ -193,9 -197,9 -195,11 -193,9 -193,9 -193,9 -193,9 +199,11 @@@@@@@@ obj-$(CONFIG_SND_SOC_STA529)   += snd-s
       obj-$(CONFIG_SND_SOC_STAC9766)	+= snd-soc-stac9766.o
       obj-$(CONFIG_SND_SOC_TAS5086)	+= snd-soc-tas5086.o
       obj-$(CONFIG_SND_SOC_TLV320AIC23)	+= snd-soc-tlv320aic23.o
++ ++++obj-$(CONFIG_SND_SOC_TLV320AIC23_I2C)	+= snd-soc-tlv320aic23-i2c.o
++ ++++obj-$(CONFIG_SND_SOC_TLV320AIC23_SPI)	+= snd-soc-tlv320aic23-spi.o
       obj-$(CONFIG_SND_SOC_TLV320AIC26)	+= snd-soc-tlv320aic26.o
--- ---obj-$(CONFIG_SND_SOC_TLV320AIC3X)	+= snd-soc-tlv320aic3x.o
       obj-$(CONFIG_SND_SOC_TLV320AIC32X4)     += snd-soc-tlv320aic32x4.o
+++ +++obj-$(CONFIG_SND_SOC_TLV320AIC3X)	+= snd-soc-tlv320aic3x.o
       obj-$(CONFIG_SND_SOC_TLV320DAC33)	+= snd-soc-tlv320dac33.o
       obj-$(CONFIG_SND_SOC_TWL4030)	+= snd-soc-twl4030.o
       obj-$(CONFIG_SND_SOC_TWL6040)	+= snd-soc-twl6040.o