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

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

diff --git a/sound/soc/codecs/wm8995.c b/sound/soc/codecs/wm8995.c
index 24500ba..19b08a5 100644 (file)
--- a/sound/soc/codecs/wm8995.c
+++ b/sound/soc/codecs/wm8995.c
@@ -2192,12 +2192,14 @@ static const struct snd_soc_codec_driver soc_codec_dev_wm8995 = {
        .set_bias_level = wm8995_set_bias_level,
        .idle_bias_off = true,
 
-       .controls = wm8995_snd_controls,
-       .num_controls = ARRAY_SIZE(wm8995_snd_controls),
-       .dapm_widgets = wm8995_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm8995_dapm_widgets),
-       .dapm_routes = wm8995_intercon,
-       .num_dapm_routes = ARRAY_SIZE(wm8995_intercon),
+       .component_driver = {
+               .controls               = wm8995_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm8995_snd_controls),
+               .dapm_widgets           = wm8995_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm8995_dapm_widgets),
+               .dapm_routes            = wm8995_intercon,
+               .num_dapm_routes        = ARRAY_SIZE(wm8995_intercon),
+       },
 };
 
 static const struct regmap_config wm8995_regmap = {