summaryrefslogtreecommitdiffstats
path: root/sound/soc/atmel/snd-soc-afeb9260.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-01-28 08:25:43 +0100
committerTakashi Iwai <tiwai@suse.de>2011-01-28 08:25:43 +0100
commitdcc3c4c016481de3fdb99c1f6ecb04d4229513d4 (patch)
treed3d40306e6dfe0971c6f7fca6a0e37bbe66d2215 /sound/soc/atmel/snd-soc-afeb9260.c
parentALSA: HDA: Fix automute on Thinkpad L412/L512 (diff)
parentASoC: correct link specifications for corgi, poodle and spitz (diff)
downloadlinux-dcc3c4c016481de3fdb99c1f6ecb04d4229513d4.tar.xz
linux-dcc3c4c016481de3fdb99c1f6ecb04d4229513d4.zip
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/atmel/snd-soc-afeb9260.c')
-rw-r--r--sound/soc/atmel/snd-soc-afeb9260.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/atmel/snd-soc-afeb9260.c b/sound/soc/atmel/snd-soc-afeb9260.c
index da2208e06b0d..5e4d499d8434 100644
--- a/sound/soc/atmel/snd-soc-afeb9260.c
+++ b/sound/soc/atmel/snd-soc-afeb9260.c
@@ -129,7 +129,7 @@ static struct snd_soc_dai_link afeb9260_dai = {
.cpu_dai_name = "atmel-ssc-dai.0",
.codec_dai_name = "tlv320aic23-hifi",
.platform_name = "atmel_pcm-audio",
- .codec_name = "tlv320aic23-codec.0-0x1a",
+ .codec_name = "tlv320aic23-codec.0-001a",
.init = afeb9260_tlv320aic23_init,
.ops = &afeb9260_ops,
};