diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2011-01-28 08:25:43 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-01-28 08:25:43 +0100 |
| commit | dcc3c4c016481de3fdb99c1f6ecb04d4229513d4 (patch) | |
| tree | d3d40306e6dfe0971c6f7fca6a0e37bbe66d2215 /sound/soc/pxa/corgi.c | |
| parent | ALSA: HDA: Fix automute on Thinkpad L412/L512 (diff) | |
| parent | ASoC: correct link specifications for corgi, poodle and spitz (diff) | |
| download | linux-dev-dcc3c4c016481de3fdb99c1f6ecb04d4229513d4.tar.xz linux-dev-dcc3c4c016481de3fdb99c1f6ecb04d4229513d4.zip | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/pxa/corgi.c')
| -rw-r--r-- | sound/soc/pxa/corgi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c index fc592f0d5fc7..784cff5f67e8 100644 --- a/sound/soc/pxa/corgi.c +++ b/sound/soc/pxa/corgi.c @@ -307,10 +307,10 @@ static int corgi_wm8731_init(struct snd_soc_pcm_runtime *rtd) static struct snd_soc_dai_link corgi_dai = { .name = "WM8731", .stream_name = "WM8731", - .cpu_dai_name = "pxa-is2-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 = corgi_wm8731_init, .ops = &corgi_ops, }; |