Merge branch 'for-2.6.38' into for-2.6.39

This commit is contained in:
Mark Brown 2011-02-26 09:50:01 +00:00
commit ccecc127a8
1 changed files with 1 additions and 1 deletions

View File

@ -79,7 +79,7 @@ static struct snd_soc_dai_link eukrea_tlv320_dai = {
.name = "tlv320aic23",
.stream_name = "TLV320AIC23",
.codec_dai_name = "tlv320aic23-hifi",
.platform_name = "imx-pcm-audio.0",
.platform_name = "imx-fiq-pcm-audio.0",
.codec_name = "tlv320aic23-codec.0-001a",
.cpu_dai_name = "imx-ssi.0",
.ops = &eukrea_tlv320_snd_ops,