Merge tag 'tty-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[pandora-kernel.git] / sound / soc / codecs / Kconfig

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 133025f..45b7256 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -34,7 +34,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_CS42L73 if I2C
        select SND_SOC_CS4270 if I2C
        select SND_SOC_CS4271 if SND_SOC_I2C_AND_SPI
-       select SND_SOC_CX20442
+       select SND_SOC_CX20442 if TTY
        select SND_SOC_DA7210 if I2C
        select SND_SOC_DA7213 if I2C
        select SND_SOC_DA732X if I2C
@@ -237,6 +237,7 @@ config SND_SOC_CS4271
 
 config SND_SOC_CX20442
        tristate
+       depends on TTY
 
 config SND_SOC_JZ4740_CODEC
        select REGMAP_MMIO