diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-28 12:10:25 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-28 12:10:25 +0100 |
| commit | dd4028c59e98e5faf56ee447f017a356556f2732 (patch) | |
| tree | 31fa81ffb8d509f82cd777ed912cbbc5a2a5f10d /sound | |
| parent | fb257897bf20c5f0e1df584bb5b874e811651263 (diff) | |
| parent | 69b91bc1551a2fc746a01fea9d3291e60be3780d (diff) | |
| download | linux-stable-dd4028c59e98e5faf56ee447f017a356556f2732.tar.gz linux-stable-dd4028c59e98e5faf56ee447f017a356556f2732.tar.bz2 linux-stable-dd4028c59e98e5faf56ee447f017a356556f2732.zip | |
Merge branch 'for-2.6.39' into for-2.6.40
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/samsung/goni_wm8994.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/samsung/goni_wm8994.c b/sound/soc/samsung/goni_wm8994.c index f6b3a3ce5919..0e80daee8b6f 100644 --- a/sound/soc/samsung/goni_wm8994.c +++ b/sound/soc/samsung/goni_wm8994.c @@ -236,18 +236,18 @@ static struct snd_soc_dai_link goni_dai[] = { .name = "WM8994", .stream_name = "WM8994 HiFi", .cpu_dai_name = "samsung-i2s.0", - .codec_dai_name = "wm8994-hifi", + .codec_dai_name = "wm8994-aif1", .platform_name = "samsung-audio", - .codec_name = "wm8994-codec.0-0x1a", + .codec_name = "wm8994-codec.0-001a", .init = goni_wm8994_init, .ops = &goni_hifi_ops, }, { .name = "WM8994 Voice", .stream_name = "Voice", .cpu_dai_name = "goni-voice-dai", - .codec_dai_name = "wm8994-voice", + .codec_dai_name = "wm8994-aif2", .platform_name = "samsung-audio", - .codec_name = "wm8994-codec.0-0x1a", + .codec_name = "wm8994-codec.0-001a", .ops = &goni_voice_ops, }, }; |