| commit | 60e627b4530819a3c67434ef6eafd3e702ce6572 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Wed Mar 30 07:14:04 2011 +0900 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Wed Mar 30 07:14:04 2011 +0900 |
| tree | 7fcfd3cab48606940dcee04a69343a485f33d27d | |
| parent | 5683dc7ae86987e392d5616731eec636abd6c7ad [diff] | |
| parent | 326b9bdc2a0e4d556a0f444085dca103bcd505de [diff] |
Merge branch 'for-2.6.39' into for-2.6.40
diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c index 784cff5..9027da4 100644 --- a/sound/soc/pxa/corgi.c +++ b/sound/soc/pxa/corgi.c
@@ -310,7 +310,7 @@ .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, };