Merge branch 'for-2.6.39' into for-2.6.40
This commit is contained in:
commit
60e627b453
|
@ -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,
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue