diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-07 10:49:47 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-07 10:49:47 +0200 |
| commit | cf3383fbb03a0aae622b0dbcd10c6975332da68a (patch) | |
| tree | 9903268220798ce79727fcd32a97b11f057bd67e /sound/soc | |
| parent | ASoC: AD1836: Fix build error (diff) | |
| parent | ASoC: Blackfin: bf5xx-ad1836: Fix codec device name (diff) | |
| download | linux-cf3383fbb03a0aae622b0dbcd10c6975332da68a.tar.xz linux-cf3383fbb03a0aae622b0dbcd10c6975332da68a.zip | |
Merge branch 'for-3.0' into for-3.1
Diffstat (limited to 'sound/soc')
| -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[] = { .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, }, { @@ -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, }, }; |