diff options
| author | Mark Brown <broonie@kernel.org> | 2016-05-13 14:27:16 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-13 14:27:16 +0100 |
| commit | 515511a7920c69aebf7f5fef0cb8e1df6767f34c (patch) | |
| tree | 2cd9ac2853bb11aa2eeb766bb18c0b1846d8d941 /sound/soc/codecs/Kconfig | |
| parent | 180bc41ad11b9a7ec5b420fbcef6570163d09204 (diff) | |
| parent | 8f658815da156a9239b98b34e5ba1d3db71a2f6e (diff) | |
| download | blackbird-obmc-linux-515511a7920c69aebf7f5fef0cb8e1df6767f34c.tar.gz blackbird-obmc-linux-515511a7920c69aebf7f5fef0cb8e1df6767f34c.zip | |
Merge remote-tracking branch 'asoc/topic/hdmi' into asoc-next
Diffstat (limited to 'sound/soc/codecs/Kconfig')
| -rw-r--r-- | sound/soc/codecs/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 26ae0b5d3e16..b3afae990e39 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -88,6 +88,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_MC13783 if MFD_MC13XXX select SND_SOC_ML26124 if I2C select SND_SOC_NAU8825 if I2C + select SND_SOC_HDMI_CODEC select SND_SOC_PCM1681 if I2C select SND_SOC_PCM179X_I2C if I2C select SND_SOC_PCM179X_SPI if SPI_MASTER @@ -478,6 +479,11 @@ config SND_SOC_BT_SCO config SND_SOC_DMIC tristate +config SND_SOC_HDMI_CODEC + tristate + select SND_PCM_ELD + select SND_PCM_IEC958 + config SND_SOC_ES8328 tristate "Everest Semi ES8328 CODEC" |
