diff options
| author | Len Brown <len.brown@intel.com> | 2011-03-18 18:06:08 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-03-18 18:06:08 -0400 |
| commit | 05534c9ffc9d5d950b14de8ba49a7609dc59b0b8 (patch) | |
| tree | 65a01a1e0bc0e28c64fb5105cc763949f5412b4b /sound/soc/pxa/palm27x.c | |
| parent | dd87cc53c42f3260b7eb7f60822de0fa9e58af59 (diff) | |
| parent | 589c7a39ae2f2b74fd13ae344ca1dcca61da6bca (diff) | |
Merge branch 'acpica' into release
Diffstat (limited to 'sound/soc/pxa/palm27x.c')
| -rw-r--r-- | sound/soc/pxa/palm27x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/pxa/palm27x.c b/sound/soc/pxa/palm27x.c index 857db96d4a4f..504e4004f004 100644 --- a/sound/soc/pxa/palm27x.c +++ b/sound/soc/pxa/palm27x.c | |||
| @@ -132,7 +132,7 @@ static struct snd_soc_dai_link palm27x_dai[] = { | |||
| 132 | { | 132 | { |
| 133 | .name = "AC97 HiFi", | 133 | .name = "AC97 HiFi", |
| 134 | .stream_name = "AC97 HiFi", | 134 | .stream_name = "AC97 HiFi", |
| 135 | .cpu_dai_name = "pxa-ac97.0", | 135 | .cpu_dai_name = "pxa2xx-ac97", |
| 136 | .codec_dai_name = "wm9712-hifi", | 136 | .codec_dai_name = "wm9712-hifi", |
| 137 | .codec_name = "wm9712-codec", | 137 | .codec_name = "wm9712-codec", |
| 138 | .platform_name = "pxa-pcm-audio", | 138 | .platform_name = "pxa-pcm-audio", |
| @@ -141,7 +141,7 @@ static struct snd_soc_dai_link palm27x_dai[] = { | |||
| 141 | { | 141 | { |
| 142 | .name = "AC97 Aux", | 142 | .name = "AC97 Aux", |
| 143 | .stream_name = "AC97 Aux", | 143 | .stream_name = "AC97 Aux", |
| 144 | .cpu_dai_name = "pxa-ac97.1", | 144 | .cpu_dai_name = "pxa2xx-ac97-aux", |
| 145 | .codec_dai_name = "wm9712-aux", | 145 | .codec_dai_name = "wm9712-aux", |
| 146 | .codec_name = "wm9712-codec", | 146 | .codec_name = "wm9712-codec", |
| 147 | .platform_name = "pxa-pcm-audio", | 147 | .platform_name = "pxa-pcm-audio", |