diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-05 17:12:39 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-05 17:12:39 (GMT) |
| commit | 6c3137fd01038972bf2ffe1e6fc4bb51b26e51f2 (patch) | |
| tree | 92a6b7232a02ed69b86219e8f125e08bf95f3837 /sound/soc/codecs/Kconfig | |
| parent | 13b02fa0dbb1311d08dfacd897a6ff41232d7cfb (diff) | |
| parent | 95169d080fcaad6c990ce3602d9b3d38753b1fa4 (diff) | |
| download | linux-fsl-qoriq-6c3137fd01038972bf2ffe1e6fc4bb51b26e51f2.tar.xz | |
Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-new-pcm
Trivial add/add conflicts:
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile
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 4afe943..1b8ed17 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -54,6 +54,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_MC13783 if MFD_MC13XXX select SND_SOC_ML26124 if I2C select SND_SOC_HDMI_CODEC + select SND_SOC_PCM1681 if I2C select SND_SOC_PCM1792A if SPI_MASTER select SND_SOC_PCM3008 select SND_SOC_RT5631 if I2C @@ -293,6 +294,9 @@ config SND_SOC_MAX9850 config SND_SOC_HDMI_CODEC tristate +config SND_SOC_PCM1681 + tristate + config SND_SOC_PCM1792A tristate |