Merge branch 'linus' into release

[~andy/linux] / sound / soc / codecs / Kconfig

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index c04da1871297a92a9d63367b99a0162abe6af5b8..d63c1754e05f82d75e5f2a8763bf4cf1540c763a 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -29,8 +29,11 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_CS4271 if SND_SOC_I2C_AND_SPI
        select SND_SOC_CX20442
        select SND_SOC_DA7210 if I2C
+       select SND_SOC_DFBMCS320
        select SND_SOC_JZ4740_CODEC if SOC_JZ4740
+       select SND_SOC_LM4857 if I2C
        select SND_SOC_MAX98088 if I2C
+       select SND_SOC_MAX9850 if I2C
        select SND_SOC_MAX9877 if I2C
        select SND_SOC_PCM3008
        select SND_SOC_SGTL5000 if I2C
@@ -40,6 +43,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_STAC9766 if SND_SOC_AC97_BUS
        select SND_SOC_TLV320AIC23 if I2C
        select SND_SOC_TLV320AIC26 if SPI_MASTER
+       select SND_SOC_TVL320AIC32X4 if I2C
        select SND_SOC_TLV320AIC3X if I2C
        select SND_SOC_TPA6130A2 if I2C
        select SND_SOC_TLV320DAC33 if I2C
@@ -174,12 +178,18 @@ config SND_SOC_L3
 config SND_SOC_DA7210
         tristate
 
+config SND_SOC_DFBMCS320
+       tristate
+
 config SND_SOC_DMIC
        tristate
 
 config SND_SOC_MAX98088
        tristate
 
+config SND_SOC_MAX9850
+       tristate
+
 config SND_SOC_PCM3008
        tristate
 
@@ -206,6 +216,9 @@ config SND_SOC_TLV320AIC26
        tristate "TI TLV320AIC26 Codec support" if SND_SOC_OF_SIMPLE
        depends on SPI
 
+config SND_SOC_TVL320AIC32X4
+       tristate
+
 config SND_SOC_TLV320AIC3X
        tristate
 
@@ -343,6 +356,9 @@ config SND_SOC_WM9713
        tristate
 
 # Amp
+config SND_SOC_LM4857
+       tristate
+
 config SND_SOC_MAX9877
        tristate
 
@@ -354,4 +370,3 @@ config SND_SOC_WM2000
 
 config SND_SOC_WM9090
        tristate
-