Merge remote-tracking branch 'iommu/next'

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

diff --git a/sound/soc/codecs/sta32x.c b/sound/soc/codecs/sta32x.c
index a9844b2ac829d03ae4142a69b6b815fc9df02f44..0790ae8530d96dba77d25165aefb8f5f2ad88779 100644 (file)
--- a/sound/soc/codecs/sta32x.c
+++ b/sound/soc/codecs/sta32x.c
@@ -991,12 +991,14 @@ static const struct snd_soc_codec_driver sta32x_codec = {
        .remove =               sta32x_remove,
        .set_bias_level =       sta32x_set_bias_level,
        .suspend_bias_off =     true,
-       .controls =             sta32x_snd_controls,
-       .num_controls =         ARRAY_SIZE(sta32x_snd_controls),
-       .dapm_widgets =         sta32x_dapm_widgets,
-       .num_dapm_widgets =     ARRAY_SIZE(sta32x_dapm_widgets),
-       .dapm_routes =          sta32x_dapm_routes,
-       .num_dapm_routes =      ARRAY_SIZE(sta32x_dapm_routes),
+       .component_driver = {
+               .controls =             sta32x_snd_controls,
+               .num_controls =         ARRAY_SIZE(sta32x_snd_controls),
+               .dapm_widgets =         sta32x_dapm_widgets,
+               .num_dapm_widgets =     ARRAY_SIZE(sta32x_dapm_widgets),
+               .dapm_routes =          sta32x_dapm_routes,
+               .num_dapm_routes =      ARRAY_SIZE(sta32x_dapm_routes),
+       },
 };
 
 static const struct regmap_config sta32x_regmap = {