Merge branch 'topic/input' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

Conflicts:
	sound/soc/codecs/Kconfig

diff --cc sound/soc/codecs/Kconfig
index 5279ef41597d66e35c1184ccf7143dffa2051b10,d4260d39dbde81e00fc6e46ad89448092d947ee0..d739ba7baefff11ebcf0959e0795a15f6302fd76
--- 1/sound/soc/codecs/Kconfig
--- 2/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"