Skip to content

Commit

Permalink
Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kerne…
Browse files Browse the repository at this point in the history
…l/git/broonie/sound-2.6 into fix/asoc
  • Loading branch information
Takashi Iwai committed Mar 30, 2011
2 parents d454f39 + 326b9bd commit f8852b1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sound/soc/pxa/corgi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Expand Down

0 comments on commit f8852b1

Please sign in to comment.