Skip to content

Commit

Permalink
Merge branch 'for-3.0' into for-3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed Jun 7, 2011
2 parents 0c8e291 + 064d58e commit cf3383f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions sound/soc/blackfin/bf5xx-ad1836.c
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ static struct snd_soc_dai_link bf5xx_ad1836_dai[] = {
.cpu_dai_name = "bfin-tdm.0",
.codec_dai_name = "ad1836-hifi",
.platform_name = "bfin-tdm-pcm-audio",
.codec_name = "ad1836.0",
.codec_name = "spi0.4",
.ops = &bf5xx_ad1836_ops,
},
{
Expand All @@ -84,7 +84,7 @@ static struct snd_soc_dai_link bf5xx_ad1836_dai[] = {
.cpu_dai_name = "bfin-tdm.1",
.codec_dai_name = "ad1836-hifi",
.platform_name = "bfin-tdm-pcm-audio",
.codec_name = "ad1836.0",
.codec_name = "spi0.4",
.ops = &bf5xx_ad1836_ops,
},
};
Expand Down

0 comments on commit cf3383f

Please sign in to comment.