diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-02-26 11:27:47 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-02-26 11:27:47 +0100 |
| commit | 11be6a269d2ad3e94c0597f21786092b8340a822 (patch) | |
| tree | a1b244c74f210750d0bb7a6af03332d7ccbfacbd /sound/soc/pxa/e740_wm9705.c | |
| parent | 4dfb8a45d533808e78d67ef27e0a47d456c12a92 (diff) | |
| parent | 43c63188821dc21b2af23a40a18faea6e386e90a (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/pxa/e740_wm9705.c')
| -rw-r--r-- | sound/soc/pxa/e740_wm9705.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/pxa/e740_wm9705.c b/sound/soc/pxa/e740_wm9705.c index 28333e7d9c5..dc65650a6fa 100644 --- a/sound/soc/pxa/e740_wm9705.c +++ b/sound/soc/pxa/e740_wm9705.c @@ -117,7 +117,7 @@ static struct snd_soc_dai_link e740_dai[] = { { .name = "AC97", .stream_name = "AC97 HiFi", - .cpu_dai_name = "pxa-ac97.0", + .cpu_dai_name = "pxa2xx-ac97", .codec_dai_name = "wm9705-hifi", .platform_name = "pxa-pcm-audio", .codec_name = "wm9705-codec", @@ -126,7 +126,7 @@ static struct snd_soc_dai_link e740_dai[] = { { .name = "AC97 Aux", .stream_name = "AC97 Aux", - .cpu_dai_name = "pxa-ac97.1", + .cpu_dai_name = "pxa2xx-ac97-aux", .codec_dai_name = "wm9705-aux", .platform_name = "pxa-pcm-audio", .codec_name = "wm9705-codec", |