Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd4028c5 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.39' into for-2.6.40

parents fb257897 69b91bc1

sound/soc/samsung/goni_wm8994.c

+4 −4
Original line number Diff line number Diff line
@@ -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,

},

};