diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-03-04 16:13:58 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-03-04 16:13:58 +0100 |
| commit | 019ae33410581e09f429fba5cbbf0daa96d6659a (patch) | |
| tree | c9850f1a3438c255dbe022e0e95da57c182ac9f2 | |
| parent | e49a3434f1bc64dc49ff3a56e416bb5894868dde (diff) | |
| parent | b2ccf065f7b23147ed135a41b01d05a332ca6b7e (diff) | |
| download | linux-019ae33410581e09f429fba5cbbf0daa96d6659a.tar.gz linux-019ae33410581e09f429fba5cbbf0daa96d6659a.tar.bz2 linux-019ae33410581e09f429fba5cbbf0daa96d6659a.zip | |
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.
| -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[] = { .platform_name = "samsung-audio", .cpu_dai_name = "s3c24xx-iis", .codec_dai_name = "wm8753-hifi", - .codec_name = "wm8753-codec.0-001a", + .codec_name = "wm8753.0-001a", .init = neo1973_wm8753_init, .ops = &neo1973_hifi_ops, }, @@ -376,7 +376,7 @@ static struct snd_soc_dai_link neo1973_dai[] = { .stream_name = "Voice", .cpu_dai_name = "dfbmcs320-pcm", .codec_dai_name = "wm8753-voice", - .codec_name = "wm8753-codec.0-001a", + .codec_name = "wm8753.0-001a", .ops = &neo1973_voice_ops, }, }; |