Merge tag 'asoc-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound...

[cascardo/linux.git] / sound / soc / codecs / ad1836.c

diff --git a/sound/soc/codecs/ad1836.c b/sound/soc/codecs/ad1836.c
index e2ce6c4..a478239 100644 (file)
--- a/sound/soc/codecs/ad1836.c
+++ b/sound/soc/codecs/ad1836.c
@@ -327,12 +327,14 @@ static struct snd_soc_codec_driver soc_codec_dev_ad1836 = {
        .suspend = ad1836_suspend,
        .resume = ad1836_resume,
 
-       .controls = ad183x_controls,
-       .num_controls = ARRAY_SIZE(ad183x_controls),
-       .dapm_widgets = ad183x_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(ad183x_dapm_widgets),
-       .dapm_routes = ad183x_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(ad183x_dapm_routes),
+       .component_driver = {
+               .controls               = ad183x_controls,
+               .num_controls           = ARRAY_SIZE(ad183x_controls),
+               .dapm_widgets           = ad183x_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(ad183x_dapm_widgets),
+               .dapm_routes            = ad183x_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(ad183x_dapm_routes),
+       },
 };
 
 static const struct reg_default ad1836_reg_defaults[] = {