diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-03-04 10:13:58 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-03-04 10:13:58 -0500 |
commit | 019ae33410581e09f429fba5cbbf0daa96d6659a (patch) | |
tree | c9850f1a3438c255dbe022e0e95da57c182ac9f2 /sound | |
parent | e49a3434f1bc64dc49ff3a56e416bb5894868dde (diff) | |
parent | b2ccf065f7b23147ed135a41b01d05a332ca6b7e (diff) |
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.
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/samsung/neo1973_wm8753.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/samsung/neo1973_wm8753.c b/sound/soc/samsung/neo1973_wm8753.c index c6012ff5bd3e..d23b19a59d83 100644 --- a/sound/soc/samsung/neo1973_wm8753.c +++ b/sound/soc/samsung/neo1973_wm8753.c | |||
@@ -367,7 +367,7 @@ static struct snd_soc_dai_link neo1973_dai[] = { | |||
367 | .platform_name = "samsung-audio", | 367 | .platform_name = "samsung-audio", |
368 | .cpu_dai_name = "s3c24xx-iis", | 368 | .cpu_dai_name = "s3c24xx-iis", |
369 | .codec_dai_name = "wm8753-hifi", | 369 | .codec_dai_name = "wm8753-hifi", |
370 | .codec_name = "wm8753-codec.0-001a", | 370 | .codec_name = "wm8753.0-001a", |
371 | .init = neo1973_wm8753_init, | 371 | .init = neo1973_wm8753_init, |
372 | .ops = &neo1973_hifi_ops, | 372 | .ops = &neo1973_hifi_ops, |
373 | }, | 373 | }, |
@@ -376,7 +376,7 @@ static struct snd_soc_dai_link neo1973_dai[] = { | |||
376 | .stream_name = "Voice", | 376 | .stream_name = "Voice", |
377 | .cpu_dai_name = "dfbmcs320-pcm", | 377 | .cpu_dai_name = "dfbmcs320-pcm", |
378 | .codec_dai_name = "wm8753-voice", | 378 | .codec_dai_name = "wm8753-voice", |
379 | .codec_name = "wm8753-codec.0-001a", | 379 | .codec_name = "wm8753.0-001a", |
380 | .ops = &neo1973_voice_ops, | 380 | .ops = &neo1973_voice_ops, |
381 | }, | 381 | }, |
382 | }; | 382 | }; |