korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-17 16:14:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-2.6.39' into for-2.6.40

Browse Source
This commit is contained in:
Mark Brown 2011-04-28 12:10:25 +01:00
commit dd4028c59e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/soc/samsung/goni_wm8994.c
View File

@ -236,18 +236,18 @@ static struct snd_soc_dai_link goni_dai[] = {
.name = "WM8994", .name = "WM8994",
.stream_name = "WM8994 HiFi", .stream_name = "WM8994 HiFi",
.cpu_dai_name = "samsung-i2s.0", .cpu_dai_name = "samsung-i2s.0",
.codec_dai_name = "wm8994-hifi", .codec_dai_name = "wm8994-aif1",
.platform_name = "samsung-audio", .platform_name = "samsung-audio",
.codec_name = "wm8994-codec.0-0x1a", .codec_name = "wm8994-codec.0-001a",
.init = goni_wm8994_init, .init = goni_wm8994_init,
.ops = &goni_hifi_ops, .ops = &goni_hifi_ops,
}, { }, {
.name = "WM8994 Voice", .name = "WM8994 Voice",
.stream_name = "Voice", .stream_name = "Voice",
.cpu_dai_name = "goni-voice-dai", .cpu_dai_name = "goni-voice-dai",
.codec_dai_name = "wm8994-voice", .codec_dai_name = "wm8994-aif2",
.platform_name = "samsung-audio", .platform_name = "samsung-audio",
.codec_name = "wm8994-codec.0-0x1a", .codec_name = "wm8994-codec.0-001a",
.ops = &goni_voice_ops, .ops = &goni_voice_ops,
}, },
}; };