diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-17 17:20:25 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-17 17:20:25 +0100 |
| commit | 60790c5735c78e2576fcb1e2fa47f5f11464445a (patch) | |
| tree | 22dfa9d3bd7a0f5a1f8c808e14b2da04d5794dc7 /sound/soc/codecs/Kconfig | |
| parent | 3843e87ebd2f3304df5f75bb34b0ee207d3b4356 (diff) | |
| parent | 9be94aeabf551aa5e2481ab9d626ba82d6b14f3d (diff) | |
| download | kernel_goldelico_gta04-60790c5735c78e2576fcb1e2fa47f5f11464445a.zip kernel_goldelico_gta04-60790c5735c78e2576fcb1e2fa47f5f11464445a.tar.gz kernel_goldelico_gta04-60790c5735c78e2576fcb1e2fa47f5f11464445a.tar.bz2 | |
Merge remote-tracking branch 'asoc/topic/rt5640' 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 c691e22..0615e00 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -56,6 +56,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_HDMI_CODEC select SND_SOC_PCM3008 select SND_SOC_RT5631 if I2C + select SND_SOC_RT5640 if I2C select SND_SOC_SGTL5000 if I2C select SND_SOC_SI476X if MFD_SI476X_CORE select SND_SOC_SN95031 if INTEL_SCU_IPC @@ -296,6 +297,9 @@ config SND_SOC_PCM3008 config SND_SOC_RT5631 tristate +config SND_SOC_RT5640 + tristate + #Freescale sgtl5000 codec config SND_SOC_SGTL5000 tristate |