Merge branch 'for-2.6.39' into for-2.6.40

60e627b4 · Mark Brown · 5683dc7a · 326b9bdc · 60e627b4
Commit 60e627b4 authored Mar 30, 2011 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sound/soc/pxa/corgi.c sound/soc/pxa/corgi.c +1 -1

No files found.
--- a/sound/soc/pxa/corgi.c
+++ b/sound/soc/pxa/corgi.c
@@ -310,7 +310,7 @@ static struct snd_soc_dai_link corgi_dai = {
 	.cpu_dai_name = "pxa2xx-i2s",
 	.codec_dai_name = "wm8731-hifi",
 	.platform_name = "pxa-pcm-audio",
-	.codec_name = "wm8731-codec-0.001b",
+	.codec_name = "wm8731-codec.0-001b",
 	.init = corgi_wm8731_init,
 	.ops = &corgi_ops,
 };