aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolin Chen <b42378@freescale.com>2013-09-01 22:52:02 -0400
committerNitin Garg <nitin.garg@freescale.com>2014-04-16 09:01:37 -0400
commit6e5dfd26ad306f149bce3f347e119fd2a2914601 (patch)
treed3214dd142ef301d89dbf466ef3538f71bb1da2e
parent32f2e79b2b7f55d78301bce33f837a0a77a2cc14 (diff)
ENGR00277299-2 ASoC: codec: Generalise omap hdmi audio dummy codec driver
The omap hdmi audio dummy codec driver is a generic hdmi codec driver but have build dependency, thus drop the dependency in order to use it. Signed-off-by: Nicolin Chen <b42378@freescale.com>
-rw-r--r--sound/soc/codecs/Kconfig2
-rw-r--r--sound/soc/codecs/omap-hdmi.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 74cdc255912d..7b7801e06b86 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -54,7 +54,7 @@ config SND_SOC_ALL_CODECS
54 select SND_SOC_MAX9877 if I2C 54 select SND_SOC_MAX9877 if I2C
55 select SND_SOC_MC13783 if MFD_MC13XXX 55 select SND_SOC_MC13783 if MFD_MC13XXX
56 select SND_SOC_ML26124 if I2C 56 select SND_SOC_ML26124 if I2C
57 select SND_SOC_OMAP_HDMI_CODEC if OMAP4_DSS_HDMI 57 select SND_SOC_OMAP_HDMI_CODEC
58 select SND_SOC_PCM3008 58 select SND_SOC_PCM3008
59 select SND_SOC_RT5631 if I2C 59 select SND_SOC_RT5631 if I2C
60 select SND_SOC_SGTL5000 if I2C 60 select SND_SOC_SGTL5000 if I2C
diff --git a/sound/soc/codecs/omap-hdmi.c b/sound/soc/codecs/omap-hdmi.c
index 529d06444c54..75160d721cf9 100644
--- a/sound/soc/codecs/omap-hdmi.c
+++ b/sound/soc/codecs/omap-hdmi.c
@@ -26,7 +26,7 @@
26static struct snd_soc_codec_driver omap_hdmi_codec; 26static struct snd_soc_codec_driver omap_hdmi_codec;
27 27
28static struct snd_soc_dai_driver omap_hdmi_codec_dai = { 28static struct snd_soc_dai_driver omap_hdmi_codec_dai = {
29 .name = "omap-hdmi-hifi", 29 .name = "hdmi-hifi",
30 .playback = { 30 .playback = {
31 .channels_min = 2, 31 .channels_min = 2,
32 .channels_max = 8, 32 .channels_max = 8,