diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-25 15:19:29 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-25 15:19:29 +0000 |
| commit | 16f9e062a70a81f5fcb597fbc2b8e8a0727a83ff (patch) | |
| tree | 075e45485d7bf0bf5d8a03f35b013a1bd512f960 /sound/soc/pxa/corgi.c | |
| parent | 0d42e6e77f8b872483833a7146286edaaaeb2f39 (diff) | |
| parent | a3adfa00e8089aa72826c6ba04bcb18cfceaf0a9 (diff) | |
| download | kernel_goldelico_gta04-16f9e062a70a81f5fcb597fbc2b8e8a0727a83ff.zip kernel_goldelico_gta04-16f9e062a70a81f5fcb597fbc2b8e8a0727a83ff.tar.gz kernel_goldelico_gta04-16f9e062a70a81f5fcb597fbc2b8e8a0727a83ff.tar.bz2 | |
Merge branch 'for-2.6.38' into for-2.6.39
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 fc592f0..784cff5 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, }; |