Merge remote-tracking branches 'asoc/topic/ad1980', 'asoc/topic/adsp', 'asoc/topic...

[linux-2.6-microblaze.git] / sound / soc / codecs / Kconfig

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index f0e8401..6735435 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -80,6 +80,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_SSM2602_SPI if SPI_MASTER
        select SND_SOC_SSM2602_I2C if I2C
        select SND_SOC_STA32X if I2C
+       select SND_SOC_STA350 if I2C
        select SND_SOC_STA529 if I2C
        select SND_SOC_STAC9766 if SND_SOC_AC97_BUS
        select SND_SOC_TAS5086 if I2C
@@ -269,7 +270,7 @@ config SND_SOC_AK5386
        tristate "AKM AK5638 CODEC"
 
 config SND_SOC_ALC5623
-       tristate
+       tristate "Realtek ALC5623 CODEC"
 
 config SND_SOC_ALC5632
        tristate
@@ -435,6 +436,10 @@ config SND_SOC_SSM2602_I2C
 config SND_SOC_STA32X
        tristate
 
+config SND_SOC_STA350
+       tristate "STA350 speaker amplifier"
+       depends on I2C
+
 config SND_SOC_STA529
        tristate