Merge remote-tracking branch 'lightnvm/for-next'

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

diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index a564759845f980119a29c49633cb537ef685bcd9..5a8d96ec058c5e5464a251d86edcc2920c5e14c7 100644 (file)
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -1670,12 +1670,14 @@ static struct snd_soc_codec_driver soc_codec_dev_aic3x = {
        .idle_bias_off = true,
        .probe = aic3x_probe,
        .remove = aic3x_remove,
-       .controls = aic3x_snd_controls,
-       .num_controls = ARRAY_SIZE(aic3x_snd_controls),
-       .dapm_widgets = aic3x_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(aic3x_dapm_widgets),
-       .dapm_routes = intercon,
-       .num_dapm_routes = ARRAY_SIZE(intercon),
+       .component_driver = {
+               .controls               = aic3x_snd_controls,
+               .num_controls           = ARRAY_SIZE(aic3x_snd_controls),
+               .dapm_widgets           = aic3x_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(aic3x_dapm_widgets),
+               .dapm_routes            = intercon,
+               .num_dapm_routes        = ARRAY_SIZE(intercon),
+       },
 };
 
 /*