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/em-x270.c | |
| parent | ALSA: hda - Add support for new IDT 92HD98 and 92HD99 codecs (diff) | |
| parent | eukrea-tlv320: fix platform_name (diff) | |
| download | linux-11be6a269d2ad3e94c0597f21786092b8340a822.tar.xz linux-11be6a269d2ad3e94c0597f21786092b8340a822.zip | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/pxa/em-x270.c')
| -rw-r--r-- | sound/soc/pxa/em-x270.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/pxa/em-x270.c b/sound/soc/pxa/em-x270.c index fc22e6eefc98..b13a4252812d 100644 --- a/sound/soc/pxa/em-x270.c +++ b/sound/soc/pxa/em-x270.c @@ -37,7 +37,7 @@ static struct snd_soc_dai_link em_x270_dai[] = { { .name = "AC97", .stream_name = "AC97 HiFi", - .cpu_dai_name = "pxa-ac97.0", + .cpu_dai_name = "pxa2xx-ac97", .codec_dai_name = "wm9712-hifi", .platform_name = "pxa-pcm-audio", .codec_name = "wm9712-codec", @@ -45,7 +45,7 @@ static struct snd_soc_dai_link em_x270_dai[] = { { .name = "AC97 Aux", .stream_name = "AC97 Aux", - .cpu_dai_name = "pxa-ac97.1", + .cpu_dai_name = "pxa2xx-ac97-aux", .codec_dai_name ="wm9712-aux", .platform_name = "pxa-pcm-audio", .codec_name = "wm9712-codec", |