Merge remote-tracking branch 'iommu/next'

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

diff --git a/sound/soc/codecs/tas5720.c b/sound/soc/codecs/tas5720.c
index f54fb46b77c2f767896a6fb7b7b2ca7bf3c16598..c65b917598d2e20e7a93f3759c86e1f59bdf15f4 100644 (file)
--- a/sound/soc/codecs/tas5720.c
+++ b/sound/soc/codecs/tas5720.c
@@ -489,12 +489,14 @@ static struct snd_soc_codec_driver soc_codec_dev_tas5720 = {
        .suspend = tas5720_suspend,
        .resume = tas5720_resume,
 
-       .controls = tas5720_snd_controls,
-       .num_controls = ARRAY_SIZE(tas5720_snd_controls),
-       .dapm_widgets = tas5720_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(tas5720_dapm_widgets),
-       .dapm_routes = tas5720_audio_map,
-       .num_dapm_routes = ARRAY_SIZE(tas5720_audio_map),
+       .component_driver = {
+               .controls               = tas5720_snd_controls,
+               .num_controls           = ARRAY_SIZE(tas5720_snd_controls),
+               .dapm_widgets           = tas5720_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(tas5720_dapm_widgets),
+               .dapm_routes            = tas5720_audio_map,
+               .num_dapm_routes        = ARRAY_SIZE(tas5720_audio_map),
+       },
 };
 
 /* PCM rates supported by the TAS5720 driver */