From: Mark Brown <broonie@kernel.org>
Date: Fri, 1 Sep 2017 11:12:26 +0000 (+0100)
Subject: Merge remote-tracking branches 'asoc/topic/blackfin', 'asoc/topic/build', 'asoc/topic... 
X-Git-Tag: v4.14-rc1~114^2~3^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a641ed5e35dfa1276aa59ba1426d3e6adb0c2823;p=thirdparty%2Flinux.git

Merge remote-tracking branches 'asoc/topic/blackfin', 'asoc/topic/build', 'asoc/topic/cirrus' and 'asoc/topic/compress' into asoc-next
---

a641ed5e35dfa1276aa59ba1426d3e6adb0c2823
diff --cc sound/soc/codecs/sirf-audio-codec.c
index 50bc22266ecbc,50bc22266ecbc,01d7690a15206,6bfd25c289d19,6bfd25c289d19..7ae8c181d1a42
--- a/sound/soc/codecs/sirf-audio-codec.c
+++ b/sound/soc/codecs/sirf-audio-codec.c
@@@@@@ -429,13 -429,13 -429,15 -429,13 -429,13 +429,15 @@@@@@ static int sirf_audio_codec_remove(stru
     	return 0;
     }
     
  ---static struct snd_soc_codec_driver soc_codec_device_sirf_audio_codec = {
  +++static const struct snd_soc_codec_driver soc_codec_device_sirf_audio_codec = {
     	.probe = sirf_audio_codec_probe,
     	.remove = sirf_audio_codec_remove,
-- --	.dapm_widgets = sirf_audio_codec_dapm_widgets,
-- --	.num_dapm_widgets = ARRAY_SIZE(sirf_audio_codec_dapm_widgets),
-- --	.dapm_routes = sirf_audio_codec_map,
-- --	.num_dapm_routes = ARRAY_SIZE(sirf_audio_codec_map),
++ ++	.component_driver = {
++ ++		.dapm_widgets = sirf_audio_codec_dapm_widgets,
++ ++		.num_dapm_widgets = ARRAY_SIZE(sirf_audio_codec_dapm_widgets),
++ ++		.dapm_routes = sirf_audio_codec_map,
++ ++		.num_dapm_routes = ARRAY_SIZE(sirf_audio_codec_map),
++ ++	},
     	.idle_bias_off = true,
     };