Merge remote-tracking branches 'asoc/topic/qcom', 'asoc/topic/rockchip' and 'asoc...

[linux-2.6-block.git] / sound / soc / codecs / rt5616.c

diff --git a/sound/soc/codecs/rt5616.c b/sound/soc/codecs/rt5616.c
index e6433254c720a6cd31dbf69fd1d7bc37449a6c2d..d1f273b249910038c7e45003cd51a25e81273ebf 100644 (file)
--- a/sound/soc/codecs/rt5616.c
+++ b/sound/soc/codecs/rt5616.c
@@ -1301,12 +1301,14 @@ static struct snd_soc_codec_driver soc_codec_dev_rt5616 = {
        .resume = rt5616_resume,
        .set_bias_level = rt5616_set_bias_level,
        .idle_bias_off = true,
-       .controls = rt5616_snd_controls,
-       .num_controls = ARRAY_SIZE(rt5616_snd_controls),
-       .dapm_widgets = rt5616_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(rt5616_dapm_widgets),
-       .dapm_routes = rt5616_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(rt5616_dapm_routes),
+       .component_driver = {
+               .controls               = rt5616_snd_controls,
+               .num_controls           = ARRAY_SIZE(rt5616_snd_controls),
+               .dapm_widgets           = rt5616_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(rt5616_dapm_widgets),
+               .dapm_routes            = rt5616_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(rt5616_dapm_routes),
+       },
 };
 
 static const struct regmap_config rt5616_regmap = {