diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-03-03 12:56:34 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-03-03 12:56:34 +0100 |
| commit | d207df2df064c19a2cf4eac8f887351fe5ce526e (patch) | |
| tree | f2005e1b2017c5e35a297318dcf6fe8a635f7c87 /sound/soc/pxa/tosa.c | |
| parent | 1aa924e21eec9dbb2c5fae90a71451a700db4414 (diff) | |
| parent | c8900a0fad5ae9f4823451de17ba5dec6653ac74 (diff) | |
| download | kernel_samsung_aries-d207df2df064c19a2cf4eac8f887351fe5ce526e.zip kernel_samsung_aries-d207df2df064c19a2cf4eac8f887351fe5ce526e.tar.gz kernel_samsung_aries-d207df2df064c19a2cf4eac8f887351fe5ce526e.tar.bz2 | |
Merge branch 'fix/hda' into topic/hda
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 f75804e..4b6e5d6 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[] = { { .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", @@ -229,7 +229,7 @@ static struct snd_soc_dai_link tosa_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", |