Merge remote-tracking branch 'sound-asoc/for-next'

[deliverable/linux.git] / sound / soc / codecs / ssm4567.c

diff --git a/sound/soc/codecs/ssm4567.c b/sound/soc/codecs/ssm4567.c
index 080c78e88e102199cb9b8923f0556ce084ad22d8..2bb5a11c9ba19d1d81310558e2b78f550d3eafc9 100644 (file)
--- a/sound/soc/codecs/ssm4567.c
+++ b/sound/soc/codecs/ssm4567.c
@@ -421,12 +421,14 @@ static struct snd_soc_codec_driver ssm4567_codec_driver = {
        .set_bias_level = ssm4567_set_bias_level,
        .idle_bias_off = true,
 
-       .controls = ssm4567_snd_controls,
-       .num_controls = ARRAY_SIZE(ssm4567_snd_controls),
-       .dapm_widgets = ssm4567_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(ssm4567_dapm_widgets),
-       .dapm_routes = ssm4567_routes,
-       .num_dapm_routes = ARRAY_SIZE(ssm4567_routes),
+       .component_driver = {
+               .controls               = ssm4567_snd_controls,
+               .num_controls           = ARRAY_SIZE(ssm4567_snd_controls),
+               .dapm_widgets           = ssm4567_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(ssm4567_dapm_widgets),
+               .dapm_routes            = ssm4567_routes,
+               .num_dapm_routes        = ARRAY_SIZE(ssm4567_routes),
+       },
 };
 
 static const struct regmap_config ssm4567_regmap_config = {