diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-02 13:35:13 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-02 13:35:13 +0900 |
| commit | cc43b45684018fc94ea9e007961bcf20ed8aaed8 (patch) | |
| tree | 306a7a96b108ce355c2f6eccee2166536d228595 /sound/soc/codecs/Kconfig | |
| parent | 05cf9dd84b91fab91ddf2398ae974516445295f0 (diff) | |
| parent | 330345ebdbe68e90a9592f3e1ac3bb63aed50cf8 (diff) | |
| download | kernel_goldelico_gta04-cc43b45684018fc94ea9e007961bcf20ed8aaed8.zip kernel_goldelico_gta04-cc43b45684018fc94ea9e007961bcf20ed8aaed8.tar.gz kernel_goldelico_gta04-cc43b45684018fc94ea9e007961bcf20ed8aaed8.tar.bz2 | |
Merge remote-tracking branch 'asoc/topic/si476x' into asoc-next
Diffstat (limited to 'sound/soc/codecs/Kconfig')
| -rw-r--r-- | sound/soc/codecs/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 7f15a82..3a84782 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -55,6 +55,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_PCM3008 select SND_SOC_RT5631 if I2C select SND_SOC_SGTL5000 if I2C + select SND_SOC_SI476X if MFD_SI476X_CORE select SND_SOC_SN95031 if INTEL_SCU_IPC select SND_SOC_SPDIF select SND_SOC_SSM2602 if SND_SOC_I2C_AND_SPI @@ -289,6 +290,9 @@ config SND_SOC_RT5631 config SND_SOC_SGTL5000 tristate +config SND_SOC_SI476X + tristate + config SND_SOC_SIGMADSP tristate select CRC32 |