Merge remote-tracking branches 'asoc/topic/ac97', 'asoc/topic/arizona', 'asoc/topic...

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

diff --git a/sound/soc/codecs/rt5659.c b/sound/soc/codecs/rt5659.c
index 1b30914c2d916ddd70db50b6e6203eeb0ef486e3..59ddaf34705b3aef90d3d80786686921c8511dcf 100644 (file)
--- a/sound/soc/codecs/rt5659.c
+++ b/sound/soc/codecs/rt5659.c
@@ -3722,12 +3722,14 @@ static struct snd_soc_codec_driver soc_codec_dev_rt5659 = {
        .resume = rt5659_resume,
        .set_bias_level = rt5659_set_bias_level,
        .idle_bias_off = true,
-       .controls = rt5659_snd_controls,
-       .num_controls = ARRAY_SIZE(rt5659_snd_controls),
-       .dapm_widgets = rt5659_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(rt5659_dapm_widgets),
-       .dapm_routes = rt5659_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(rt5659_dapm_routes),
+       .component_driver = {
+               .controls               = rt5659_snd_controls,
+               .num_controls           = ARRAY_SIZE(rt5659_snd_controls),
+               .dapm_widgets           = rt5659_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(rt5659_dapm_widgets),
+               .dapm_routes            = rt5659_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(rt5659_dapm_routes),
+       },
 };