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

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

diff --git a/sound/soc/codecs/isabelle.c b/sound/soc/codecs/isabelle.c
index be448373d39afa390a2c1cd444bb44cd5975c69b..a4b0eded984aff2ce711fc70c84545ef3df02fcd 100644 (file)
--- a/sound/soc/codecs/isabelle.c
+++ b/sound/soc/codecs/isabelle.c
@@ -1089,12 +1089,14 @@ static struct snd_soc_dai_driver isabelle_dai[] = {
 
 static struct snd_soc_codec_driver soc_codec_dev_isabelle = {
        .set_bias_level = isabelle_set_bias_level,
-       .controls = isabelle_snd_controls,
-       .num_controls = ARRAY_SIZE(isabelle_snd_controls),
-       .dapm_widgets = isabelle_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(isabelle_dapm_widgets),
-       .dapm_routes = isabelle_intercon,
-       .num_dapm_routes = ARRAY_SIZE(isabelle_intercon),
+       .component_driver = {
+               .controls               = isabelle_snd_controls,
+               .num_controls           = ARRAY_SIZE(isabelle_snd_controls),
+               .dapm_widgets           = isabelle_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(isabelle_dapm_widgets),
+               .dapm_routes            = isabelle_intercon,
+               .num_dapm_routes        = ARRAY_SIZE(isabelle_intercon),
+       },
        .idle_bias_off = true,
 };