diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-04-05 09:12:41 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-04-05 09:12:41 +0200 |
| commit | 09f68072b32089f2e3b4749161eb3ce954faf8d4 (patch) | |
| tree | b8b3c84f8a9c7150c2d830428daa3d641917ecf3 /sound/soc/pxa/poodle.c | |
| parent | d454f39f3ff3ee5a818c271026081a48a537bd41 (diff) | |
| parent | ef49e4fae3f364af8da041dcc1bb4931c749b3da (diff) | |
Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc
Diffstat (limited to 'sound/soc/pxa/poodle.c')
| -rw-r--r-- | sound/soc/pxa/poodle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c index a7d4999f9b2..da3ae4316cf 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-001b", + .codec_name = "wm8731.0-001b", .init = poodle_wm8731_init, .ops = &poodle_ops, }; |