aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-03-30 08:35:18 +0200
committerTakashi Iwai <tiwai@suse.de>2011-03-30 08:35:18 +0200
commitf8852b12200df393b0a4db1a7052454bbc335443 (patch)
tree37c359a5366cea97278c8cb9619292459c1d5538 /sound
parentd454f39f3ff3ee5a818c271026081a48a537bd41 (diff)
parent326b9bdc2a0e4d556a0f444085dca103bcd505de (diff)
Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/pxa/corgi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c
index 784cff5f67e8..9027da466cae 100644
--- 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,
};

Privacy Policy