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

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

diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c
index 8d91470..af95d64 100644 (file)
--- a/sound/soc/codecs/wm8804.c
+++ b/sound/soc/codecs/wm8804.c
@@ -545,10 +545,12 @@ static struct snd_soc_dai_driver wm8804_dai = {
 static const struct snd_soc_codec_driver soc_codec_dev_wm8804 = {
        .idle_bias_off = true,
 
-       .dapm_widgets = wm8804_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm8804_dapm_widgets),
-       .dapm_routes = wm8804_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm8804_dapm_routes),
+       .component_driver = {
+               .dapm_widgets           = wm8804_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm8804_dapm_widgets),
+               .dapm_routes            = wm8804_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm8804_dapm_routes),
+       },
 };
 
 const struct regmap_config wm8804_regmap_config = {