diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-02-25 06:45:09 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-02-25 06:45:09 -0500 |
| commit | 5448716ba966307d518d5c6fd52a9de5e7108e26 (patch) | |
| tree | b1c444f0e479a2ea71d0bef72e5bc750219fa252 /sound/soc/pxa/tosa.c | |
| parent | a3cd50deef7ba7df506af5347764a00b4621d7a7 (diff) | |
| parent | 4bfc4e2508234f9149fd33fae853e99fb9e4a75b (diff) | |
Merge branch 'for-2.6.38' into for-2.6.39
Diffstat (limited to 'sound/soc/pxa/tosa.c')
| -rw-r--r-- | sound/soc/pxa/tosa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c index 489139a31cf9..9a2351366957 100644 --- a/sound/soc/pxa/tosa.c +++ b/sound/soc/pxa/tosa.c | |||
| @@ -219,7 +219,7 @@ static struct snd_soc_dai_link tosa_dai[] = { | |||
| 219 | { | 219 | { |
| 220 | .name = "AC97", | 220 | .name = "AC97", |
| 221 | .stream_name = "AC97 HiFi", | 221 | .stream_name = "AC97 HiFi", |
| 222 | .cpu_dai_name = "pxa-ac97.0", | 222 | .cpu_dai_name = "pxa2xx-ac97", |
| 223 | .codec_dai_name = "wm9712-hifi", | 223 | .codec_dai_name = "wm9712-hifi", |
| 224 | .platform_name = "pxa-pcm-audio", | 224 | .platform_name = "pxa-pcm-audio", |
| 225 | .codec_name = "wm9712-codec", | 225 | .codec_name = "wm9712-codec", |
| @@ -229,7 +229,7 @@ static struct snd_soc_dai_link tosa_dai[] = { | |||
| 229 | { | 229 | { |
| 230 | .name = "AC97 Aux", | 230 | .name = "AC97 Aux", |
| 231 | .stream_name = "AC97 Aux", | 231 | .stream_name = "AC97 Aux", |
| 232 | .cpu_dai_name = "pxa-ac97.1", | 232 | .cpu_dai_name = "pxa2xx-ac97-aux", |
| 233 | .codec_dai_name = "wm9712-aux", | 233 | .codec_dai_name = "wm9712-aux", |
| 234 | .platform_name = "pxa-pcm-audio", | 234 | .platform_name = "pxa-pcm-audio", |
| 235 | .codec_name = "wm9712-codec", | 235 | .codec_name = "wm9712-codec", |