diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-17 17:20:21 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-17 17:20:21 +0100 |
| commit | 18923d7ec799d53fe1a26ac67586dcd0ed59ac15 (patch) | |
| tree | 9f2ca750046cfe999bbcc8a8f0379a2bfffa1cd9 /sound/soc/codecs/Kconfig | |
| parent | 0d664db6221e7f9f5649c3041f98adde00de2d97 (diff) | |
| parent | bf7c6e6ccbde22c96c5c1e5cec08740c31229df1 (diff) | |
| download | linux-stable-18923d7ec799d53fe1a26ac67586dcd0ed59ac15.tar.gz linux-stable-18923d7ec799d53fe1a26ac67586dcd0ed59ac15.tar.bz2 linux-stable-18923d7ec799d53fe1a26ac67586dcd0ed59ac15.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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 0158b05f8cc2..c691e222670a 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -53,7 +53,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_MAX9877 if I2C select SND_SOC_MC13783 if MFD_MC13XXX select SND_SOC_ML26124 if I2C - select SND_SOC_OMAP_HDMI_CODEC if OMAP4_DSS_HDMI + select SND_SOC_HDMI_CODEC select SND_SOC_PCM3008 select SND_SOC_RT5631 if I2C select SND_SOC_SGTL5000 if I2C @@ -287,7 +287,7 @@ config SND_SOC_MAX98095 config SND_SOC_MAX9850 tristate -config SND_SOC_OMAP_HDMI_CODEC +config SND_SOC_HDMI_CODEC tristate config SND_SOC_PCM3008 |