diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-02-26 05:27:47 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-02-26 05:27:47 -0500 |
| commit | 11be6a269d2ad3e94c0597f21786092b8340a822 (patch) | |
| tree | a1b244c74f210750d0bb7a6af03332d7ccbfacbd /sound/soc/pxa/zylonite.c | |
| parent | 4dfb8a45d533808e78d67ef27e0a47d456c12a92 (diff) | |
| parent | 43c63188821dc21b2af23a40a18faea6e386e90a (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/pxa/zylonite.c')
| -rw-r--r-- | sound/soc/pxa/zylonite.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/pxa/zylonite.c b/sound/soc/pxa/zylonite.c index b222a7d72027..25bba108fea3 100644 --- a/sound/soc/pxa/zylonite.c +++ b/sound/soc/pxa/zylonite.c | |||
| @@ -166,7 +166,7 @@ static struct snd_soc_dai_link zylonite_dai[] = { | |||
| 166 | .stream_name = "AC97 HiFi", | 166 | .stream_name = "AC97 HiFi", |
| 167 | .codec_name = "wm9713-codec", | 167 | .codec_name = "wm9713-codec", |
| 168 | .platform_name = "pxa-pcm-audio", | 168 | .platform_name = "pxa-pcm-audio", |
| 169 | .cpu_dai_name = "pxa-ac97.0", | 169 | .cpu_dai_name = "pxa2xx-ac97", |
| 170 | .codec_name = "wm9713-hifi", | 170 | .codec_name = "wm9713-hifi", |
| 171 | .init = zylonite_wm9713_init, | 171 | .init = zylonite_wm9713_init, |
| 172 | }, | 172 | }, |
| @@ -175,7 +175,7 @@ static struct snd_soc_dai_link zylonite_dai[] = { | |||
| 175 | .stream_name = "AC97 Aux", | 175 | .stream_name = "AC97 Aux", |
| 176 | .codec_name = "wm9713-codec", | 176 | .codec_name = "wm9713-codec", |
| 177 | .platform_name = "pxa-pcm-audio", | 177 | .platform_name = "pxa-pcm-audio", |
| 178 | .cpu_dai_name = "pxa-ac97.1", | 178 | .cpu_dai_name = "pxa2xx-ac97-aux", |
| 179 | .codec_name = "wm9713-aux", | 179 | .codec_name = "wm9713-aux", |
| 180 | }, | 180 | }, |
| 181 | { | 181 | { |