diff options
author | Mark Brown <broonie@linaro.org> | 2013-07-04 18:30:01 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-07-04 18:30:01 +0100 |
commit | 986a622df307644af14618bee54c901aa74816da (patch) | |
tree | 6da87812b9120634381e3e3987e115f90bd562e0 /sound/soc/omap/omap-hdmi-card.c | |
parent | 8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 (diff) | |
parent | 28e5ca73ef9072ed58dbb81cfff6f908be8e3cd4 (diff) |
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
Diffstat (limited to 'sound/soc/omap/omap-hdmi-card.c')
-rw-r--r-- | sound/soc/omap/omap-hdmi-card.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/omap-hdmi-card.c b/sound/soc/omap/omap-hdmi-card.c index d4eaa92e518e..7e66e9cba5a8 100644 --- a/sound/soc/omap/omap-hdmi-card.c +++ b/sound/soc/omap/omap-hdmi-card.c @@ -35,7 +35,7 @@ static struct snd_soc_dai_link omap_hdmi_dai = { .cpu_dai_name = "omap-hdmi-audio-dai", .platform_name = "omap-pcm-audio", .codec_name = "hdmi-audio-codec", - .codec_dai_name = "omap-hdmi-hifi", + .codec_dai_name = "hdmi-hifi", }; static struct snd_soc_card snd_soc_omap_hdmi = { |