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

[muen/linux.git] / sound / soc / codecs / Kconfig

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 952c44dd5e90590cf64d012700c39d6595f5edc8..aee9ef16dae62b91394fbcc56c7a22c9fda71b92 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -114,6 +114,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_PCM5102A
        select SND_SOC_PCM512x_I2C if I2C
        select SND_SOC_PCM512x_SPI if SPI_MASTER
        select SND_SOC_PCM5102A
        select SND_SOC_PCM512x_I2C if I2C
        select SND_SOC_PCM512x_SPI if SPI_MASTER

+       select SND_SOC_RT274 if I2C

        select SND_SOC_RT286 if I2C
        select SND_SOC_RT298 if I2C
        select SND_SOC_RT5514 if I2C
        select SND_SOC_RT286 if I2C
        select SND_SOC_RT298 if I2C
        select SND_SOC_RT5514 if I2C


@@ -716,11 +717,17 @@ config SND_SOC_RL6231
 
 config SND_SOC_RL6347A
        tristate
 
 config SND_SOC_RL6347A
        tristate

+       default y if SND_SOC_RT274=y

        default y if SND_SOC_RT286=y
        default y if SND_SOC_RT298=y
        default y if SND_SOC_RT286=y
        default y if SND_SOC_RT298=y

+       default m if SND_SOC_RT274=m

        default m if SND_SOC_RT286=m
        default m if SND_SOC_RT298=m
 
        default m if SND_SOC_RT286=m
        default m if SND_SOC_RT298=m
 

+config SND_SOC_RT274
+       tristate
+       depends on I2C
+

 config SND_SOC_RT286
        tristate
        depends on I2C
 config SND_SOC_RT286
        tristate
        depends on I2C