Merge tag 'asoc-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound...

[cascardo/linux.git] / sound / soc / codecs / ssm2518.c

diff --git a/sound/soc/codecs/ssm2518.c b/sound/soc/codecs/ssm2518.c
index e2e0bfa..38a85f3 100644 (file)
--- a/sound/soc/codecs/ssm2518.c
+++ b/sound/soc/codecs/ssm2518.c
@@ -715,12 +715,14 @@ static struct snd_soc_codec_driver ssm2518_codec_driver = {
        .set_sysclk = ssm2518_set_sysclk,
        .idle_bias_off = true,
 
-       .controls = ssm2518_snd_controls,
-       .num_controls = ARRAY_SIZE(ssm2518_snd_controls),
-       .dapm_widgets = ssm2518_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(ssm2518_dapm_widgets),
-       .dapm_routes = ssm2518_routes,
-       .num_dapm_routes = ARRAY_SIZE(ssm2518_routes),
+       .component_driver = {
+               .controls               = ssm2518_snd_controls,
+               .num_controls           = ARRAY_SIZE(ssm2518_snd_controls),
+               .dapm_widgets           = ssm2518_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(ssm2518_dapm_widgets),
+               .dapm_routes            = ssm2518_routes,
+               .num_dapm_routes        = ARRAY_SIZE(ssm2518_routes),
+       },
 };
 
 static const struct regmap_config ssm2518_regmap_config = {