Merge remote-tracking branches 'asoc/topic/inntel', 'asoc/topic/input', 'asoc/topic...
[sfrench/cifs-2.6.git] / sound / soc / codecs / Kconfig
index c67667bb970f1729db65b027dd8e963b9ee95b7b..fb96959665fabe2f7f7c48e3c17f38c9b4364948 100644 (file)
@@ -48,6 +48,8 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC
        select SND_SOC_CS35L32 if I2C
        select SND_SOC_CS35L33 if I2C
+       select SND_SOC_CS35L34 if I2C
+       select SND_SOC_CS42L42 if I2C
        select SND_SOC_CS42L51_I2C if I2C
        select SND_SOC_CS42L52 if I2C && INPUT
        select SND_SOC_CS42L56 if I2C && INPUT
@@ -83,6 +85,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_MAX98095 if I2C
        select SND_SOC_MAX98357A if GPIOLIB
        select SND_SOC_MAX98371 if I2C
+       select SND_SOC_MAX98504 if I2C
        select SND_SOC_MAX9867 if I2C
        select SND_SOC_MAX98925 if I2C
        select SND_SOC_MAX98926 if I2C
@@ -399,6 +402,14 @@ config SND_SOC_CS35L33
        tristate "Cirrus Logic CS35L33 CODEC"
        depends on I2C
 
+config SND_SOC_CS35L34
+       tristate "Cirrus Logic CS35L34 CODEC"
+       depends on I2C
+
+config SND_SOC_CS42L42
+       tristate "Cirrus Logic CS42L42 CODEC"
+       depends on I2C
+
 config SND_SOC_CS42L51
        tristate