Merge remote-tracking branch 'iommu/next'

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

diff --git a/sound/soc/codecs/sta529.c b/sound/soc/codecs/sta529.c
index 2cdaca943a8c488fceea517165f07aa0d47c8b60..d4b384e4b2664cf8b080ba5271fef8bcce0df5e3 100644 (file)
--- a/sound/soc/codecs/sta529.c
+++ b/sound/soc/codecs/sta529.c
@@ -317,8 +317,10 @@ static const struct snd_soc_codec_driver sta529_codec_driver = {
        .set_bias_level = sta529_set_bias_level,
        .suspend_bias_off = true,
 
-       .controls = sta529_snd_controls,
-       .num_controls = ARRAY_SIZE(sta529_snd_controls),
+       .component_driver = {
+               .controls               = sta529_snd_controls,
+               .num_controls           = ARRAY_SIZE(sta529_snd_controls),
+       },
 };
 
 static const struct regmap_config sta529_regmap = {