diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-28 07:10:25 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-28 07:10:25 -0400 |
| commit | dd4028c59e98e5faf56ee447f017a356556f2732 (patch) | |
| tree | 31fa81ffb8d509f82cd777ed912cbbc5a2a5f10d /sound/soc/samsung | |
| parent | fb257897bf20c5f0e1df584bb5b874e811651263 (diff) | |
| parent | 69b91bc1551a2fc746a01fea9d3291e60be3780d (diff) | |
Merge branch 'for-2.6.39' into for-2.6.40
Diffstat (limited to 'sound/soc/samsung')
| -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[] = { | |||
| 236 | .name = "WM8994", | 236 | .name = "WM8994", |
| 237 | .stream_name = "WM8994 HiFi", | 237 | .stream_name = "WM8994 HiFi", |
| 238 | .cpu_dai_name = "samsung-i2s.0", | 238 | .cpu_dai_name = "samsung-i2s.0", |
| 239 | .codec_dai_name = "wm8994-hifi", | 239 | .codec_dai_name = "wm8994-aif1", |
| 240 | .platform_name = "samsung-audio", | 240 | .platform_name = "samsung-audio", |
| 241 | .codec_name = "wm8994-codec.0-0x1a", | 241 | .codec_name = "wm8994-codec.0-001a", |
| 242 | .init = goni_wm8994_init, | 242 | .init = goni_wm8994_init, |
| 243 | .ops = &goni_hifi_ops, | 243 | .ops = &goni_hifi_ops, |
| 244 | }, { | 244 | }, { |
| 245 | .name = "WM8994 Voice", | 245 | .name = "WM8994 Voice", |
| 246 | .stream_name = "Voice", | 246 | .stream_name = "Voice", |
| 247 | .cpu_dai_name = "goni-voice-dai", | 247 | .cpu_dai_name = "goni-voice-dai", |
| 248 | .codec_dai_name = "wm8994-voice", | 248 | .codec_dai_name = "wm8994-aif2", |
| 249 | .platform_name = "samsung-audio", | 249 | .platform_name = "samsung-audio", |
| 250 | .codec_name = "wm8994-codec.0-0x1a", | 250 | .codec_name = "wm8994-codec.0-001a", |
| 251 | .ops = &goni_voice_ops, | 251 | .ops = &goni_voice_ops, |
| 252 | }, | 252 | }, |
| 253 | }; | 253 | }; |