Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60e627b4 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.39' into for-2.6.40

parents 5683dc7a 326b9bdc

sound/soc/pxa/corgi.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

};