diff options
| author | Mark Brown <broonie@linaro.org> | 2014-05-02 10:00:35 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-02 10:00:35 -0700 |
| commit | eba17e6868059849fc2ffa79aabdd5b59f229fb9 (patch) | |
| tree | 25c40aff5f46f9de63b331be410fda46a5dddbcb /sound/soc/codecs/Kconfig | |
| parent | 1025c05f727be33e065bb502a223637681c7991d (diff) | |
| parent | c894e394d4b96a57964aac6fda9253d47bafbbf7 (diff) | |
| download | linux-eba17e6868059849fc2ffa79aabdd5b59f229fb9.tar.bz2 | |
Merge branch 'topic/input' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-cs42l51
Conflicts:
sound/soc/codecs/Kconfig
Diffstat (limited to 'sound/soc/codecs/Kconfig')
| -rw-r--r-- | sound/soc/codecs/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 5279ef41597d..d739ba7baeff 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -40,7 +40,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_ALC5632 if I2C select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC 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 @@ -127,7 +127,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_WM8955 if I2C select SND_SOC_WM8960 if I2C select SND_SOC_WM8961 if I2C - select SND_SOC_WM8962 if I2C + select SND_SOC_WM8962 if I2C && INPUT select SND_SOC_WM8971 if I2C select SND_SOC_WM8974 if I2C select SND_SOC_WM8978 if I2C @@ -286,7 +286,7 @@ config SND_SOC_CS42L51_I2C 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" @@ -602,7 +602,7 @@ config SND_SOC_WM8961 config SND_SOC_WM8962 tristate "Wolfson Microelectronics WM8962 CODEC" - depends on I2C + depends on I2C && INPUT config SND_SOC_WM8971 tristate |