aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/sh
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-09-19 11:07:06 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-09-20 15:43:12 -0400
commit5250a5031ee5733c10c7cb371206ed3784918adc (patch)
tree3aa57d57843f078dbde57093ce714511bdcffdfe /sound/soc/sh
parentb9fde18c0582583cf12a4b1c02f621d3addd0a97 (diff)
ASoC: Fix WM8978/migor driver name conflict
Standardise on 'wm8978' as the name for the CODEC. Reported-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound/soc/sh')
-rw-r--r--sound/soc/sh/migor.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/sh/migor.c b/sound/soc/sh/migor.c
index f4620176a3ff..ac6c49ce6fdf 100644
--- a/sound/soc/sh/migor.c
+++ b/sound/soc/sh/migor.c
@@ -156,7 +156,7 @@ static struct snd_soc_dai_link migor_dai = {
156 .cpu_dai_name = "siu-i2s-dai", 156 .cpu_dai_name = "siu-i2s-dai",
157 .codec_dai_name = "wm8978-hifi", 157 .codec_dai_name = "wm8978-hifi",
158 .platform_name = "siu-pcm-audio", 158 .platform_name = "siu-pcm-audio",
159 .codec_name = "wm8978-codec.0-001a", 159 .codec_name = "wm8978.0-001a",
160 .ops = &migor_dai_ops, 160 .ops = &migor_dai_ops,
161 .init = migor_dai_init, 161 .init = migor_dai_init,
162}; 162};