summaryrefslogtreecommitdiff
path: root/sound/soc/pxa/poodle.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-01-28 10:25:43 +0300
committerTakashi Iwai <tiwai@suse.de>2011-01-28 10:25:43 +0300
commitdcc3c4c016481de3fdb99c1f6ecb04d4229513d4 (patch)
treed3d40306e6dfe0971c6f7fca6a0e37bbe66d2215 /sound/soc/pxa/poodle.c
parentded9f5238bb719737f82b0b5b957937cb0203804 (diff)
parenta3adfa00e8089aa72826c6ba04bcb18cfceaf0a9 (diff)
downloadlinux-dcc3c4c016481de3fdb99c1f6ecb04d4229513d4.tar.xz
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/pxa/poodle.c')
-rw-r--r--sound/soc/pxa/poodle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c
index 6298ee115e27..a7d4999f9b24 100644
--- a/sound/soc/pxa/poodle.c
+++ b/sound/soc/pxa/poodle.c
@@ -276,7 +276,7 @@ static struct snd_soc_dai_link poodle_dai = {
.cpu_dai_name = "pxa2xx-i2s",
.codec_dai_name = "wm8731-hifi",
.platform_name = "pxa-pcm-audio",
- .codec_name = "wm8731-codec.0-001a",
+ .codec_name = "wm8731-codec.0-001b",
.init = poodle_wm8731_init,
.ops = &poodle_ops,
};