Commit 019ae334 authored by Takashi Iwai's avatar Takashi Iwai

Merge tag 'asoc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

A driver specific fix that wasn't noticed as the OpenMoko guys have been
stuck on 2.6.39 for a very long time now and are just starting to catch
up again.
parents e49a3434 b2ccf065
...@@ -367,7 +367,7 @@ static struct snd_soc_dai_link neo1973_dai[] = { ...@@ -367,7 +367,7 @@ static struct snd_soc_dai_link neo1973_dai[] = {
.platform_name = "samsung-audio", .platform_name = "samsung-audio",
.cpu_dai_name = "s3c24xx-iis", .cpu_dai_name = "s3c24xx-iis",
.codec_dai_name = "wm8753-hifi", .codec_dai_name = "wm8753-hifi",
.codec_name = "wm8753-codec.0-001a", .codec_name = "wm8753.0-001a",
.init = neo1973_wm8753_init, .init = neo1973_wm8753_init,
.ops = &neo1973_hifi_ops, .ops = &neo1973_hifi_ops,
}, },
...@@ -376,7 +376,7 @@ static struct snd_soc_dai_link neo1973_dai[] = { ...@@ -376,7 +376,7 @@ static struct snd_soc_dai_link neo1973_dai[] = {
.stream_name = "Voice", .stream_name = "Voice",
.cpu_dai_name = "dfbmcs320-pcm", .cpu_dai_name = "dfbmcs320-pcm",
.codec_dai_name = "wm8753-voice", .codec_dai_name = "wm8753-voice",
.codec_name = "wm8753-codec.0-001a", .codec_name = "wm8753.0-001a",
.ops = &neo1973_voice_ops, .ops = &neo1973_voice_ops,
}, },
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment