From: Mark Brown <broonie@linaro.org>
Date: Fri, 2 May 2014 17:00:35 +0000 (-0700)
Subject: Merge branch 'topic/input' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=eba17e6868059849fc2ffa79aabdd5b59f229fb9;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'topic/input' of git://git./linux/kernel/git/broonie/sound into asoc-cs42l51

Conflicts:
	sound/soc/codecs/Kconfig
---

eba17e6868059849fc2ffa79aabdd5b59f229fb9
diff --cc sound/soc/codecs/Kconfig
index 5279ef41597d,d4260d39dbde..d739ba7baeff
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@ -39,8 -39,8 +39,8 @@@ config SND_SOC_ALL_CODEC
  	select SND_SOC_ALC5623 if I2C
  	select SND_SOC_ALC5632 if I2C
  	select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC
 -	select SND_SOC_CS42L51 if I2C
 +	select SND_SOC_CS42L51_I2C if I2C
- 	select SND_SOC_CS42L52 if I2C
+ 	select SND_SOC_CS42L52 if I2C && INPUT
  	select SND_SOC_CS42L73 if I2C
  	select SND_SOC_CS4270 if I2C
  	select SND_SOC_CS4271 if SND_SOC_I2C_AND_SPI
@@@ -280,13 -280,9 +280,13 @@@ config SND_SOC_CQ0093V
  config SND_SOC_CS42L51
  	tristate
  
 +config SND_SOC_CS42L51_I2C
 +	tristate
 +	select SND_SOC_CS42L51
 +
  config SND_SOC_CS42L52
  	tristate "Cirrus Logic CS42L52 CODEC"
- 	depends on I2C
+ 	depends on I2C && INPUT
  
  config SND_SOC_CS42L73
  	tristate "Cirrus Logic CS42L73 CODEC"