diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-07 04:49:47 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-07 04:49:47 -0400 |
| commit | cf3383fbb03a0aae622b0dbcd10c6975332da68a (patch) | |
| tree | 9903268220798ce79727fcd32a97b11f057bd67e | |
| parent | 0c8e2917f2f56e9836692e1d5a12f04af00b1a5a (diff) | |
| parent | 064d58ee3afb8a865a72d24e069c7258ec38640e (diff) | |
Merge branch 'for-3.0' into for-3.1
| -rw-r--r-- | sound/soc/blackfin/bf5xx-ad1836.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/blackfin/bf5xx-ad1836.c b/sound/soc/blackfin/bf5xx-ad1836.c index ea4951cf5526..f79d1655e035 100644 --- a/sound/soc/blackfin/bf5xx-ad1836.c +++ b/sound/soc/blackfin/bf5xx-ad1836.c | |||
| @@ -75,7 +75,7 @@ static struct snd_soc_dai_link bf5xx_ad1836_dai[] = { | |||
| 75 | .cpu_dai_name = "bfin-tdm.0", | 75 | .cpu_dai_name = "bfin-tdm.0", |
| 76 | .codec_dai_name = "ad1836-hifi", | 76 | .codec_dai_name = "ad1836-hifi", |
| 77 | .platform_name = "bfin-tdm-pcm-audio", | 77 | .platform_name = "bfin-tdm-pcm-audio", |
| 78 | .codec_name = "ad1836.0", | 78 | .codec_name = "spi0.4", |
| 79 | .ops = &bf5xx_ad1836_ops, | 79 | .ops = &bf5xx_ad1836_ops, |
| 80 | }, | 80 | }, |
| 81 | { | 81 | { |
| @@ -84,7 +84,7 @@ static struct snd_soc_dai_link bf5xx_ad1836_dai[] = { | |||
| 84 | .cpu_dai_name = "bfin-tdm.1", | 84 | .cpu_dai_name = "bfin-tdm.1", |
| 85 | .codec_dai_name = "ad1836-hifi", | 85 | .codec_dai_name = "ad1836-hifi", |
| 86 | .platform_name = "bfin-tdm-pcm-audio", | 86 | .platform_name = "bfin-tdm-pcm-audio", |
| 87 | .codec_name = "ad1836.0", | 87 | .codec_name = "spi0.4", |
| 88 | .ops = &bf5xx_ad1836_ops, | 88 | .ops = &bf5xx_ad1836_ops, |
| 89 | }, | 89 | }, |
| 90 | }; | 90 | }; |