From: Mark Brown <broonie@linaro.org>
Date: Wed, 12 Mar 2014 23:04:42 +0000 (+0000)
Subject: Merge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/sgtl5000', 'asoc... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7cc6417208f12804db44635bbf5ccc4bfc54f5f2;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/sgtl5000', 'asoc/topic/sh', 'asoc/topic/simple', 'asoc/topic/sirf', 'asoc/topic/sn95031', 'asoc/topic/ssm2602' and 'asoc/topic/stac9766' into asoc-next
---

7cc6417208f12804db44635bbf5ccc4bfc54f5f2
diff --cc sound/soc/blackfin/Kconfig
index b2107918f0ad,54f74f8cbb75,54f74f8cbb75,54f74f8cbb75,54f74f8cbb75,54f74f8cbb75,54f74f8cbb75,f9118dc98853,54f74f8cbb75..6347d5910138
--- a/sound/soc/blackfin/Kconfig
+++ b/sound/soc/blackfin/Kconfig
@@@@@@@@@@ -11,10 -11,10 -11,10 -11,10 -11,10 -11,10 -11,10 -11,11 -11,10 +11,11 @@@@@@@@@@ config SND_BF5XX_I2
         
         config SND_BF5XX_SOC_SSM2602
         	tristate "SoC SSM2602 Audio Codec Add-On Card support"
 --------	depends on SND_BF5XX_I2S && (SPI_MASTER || I2C)
 ++++++++	depends on SND_BF5XX_I2S && SND_SOC_I2C_AND_SPI
         	select SND_BF5XX_SOC_I2S if !BF60x
         	select SND_BF6XX_SOC_I2S if BF60x
------- -	select SND_SOC_SSM2602
+++++++ +	select SND_SOC_SSM2602_SPI if SPI_MASTER
+++++++ +	select SND_SOC_SSM2602_I2C if I2C
         	help
         	  Say Y if you want to add support for the Analog Devices
         	  SSM2602 Audio Codec Add-On Card.