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

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

diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c
index 3c5e1df01c19a31bb1069b8c1731d49e4fbee5e5..e46fb472e48dc965c8378faca1bceed69bdb1d98 100644 (file)
--- a/sound/soc/codecs/tlv320aic31xx.c
+++ b/sound/soc/codecs/tlv320aic31xx.c
@@ -1114,12 +1114,14 @@ static struct snd_soc_codec_driver soc_codec_driver_aic31xx = {
        .set_bias_level         = aic31xx_set_bias_level,
        .suspend_bias_off       = true,
 
-       .controls               = aic31xx_snd_controls,
-       .num_controls           = ARRAY_SIZE(aic31xx_snd_controls),
-       .dapm_widgets           = aic31xx_dapm_widgets,
-       .num_dapm_widgets       = ARRAY_SIZE(aic31xx_dapm_widgets),
-       .dapm_routes            = aic31xx_audio_map,
-       .num_dapm_routes        = ARRAY_SIZE(aic31xx_audio_map),
+       .component_driver = {
+               .controls               = aic31xx_snd_controls,
+               .num_controls           = ARRAY_SIZE(aic31xx_snd_controls),
+               .dapm_widgets           = aic31xx_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(aic31xx_dapm_widgets),
+               .dapm_routes            = aic31xx_audio_map,
+               .num_dapm_routes        = ARRAY_SIZE(aic31xx_audio_map),
+       },
 };
 
 static const struct snd_soc_dai_ops aic31xx_dai_ops = {