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

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

diff --git a/sound/soc/codecs/pcm3168a.c b/sound/soc/codecs/pcm3168a.c
index 992a77e..39bc02d 100644 (file)
--- a/sound/soc/codecs/pcm3168a.c
+++ b/sound/soc/codecs/pcm3168a.c
@@ -599,12 +599,14 @@ EXPORT_SYMBOL_GPL(pcm3168a_regmap);
 
 static const struct snd_soc_codec_driver pcm3168a_driver = {
        .idle_bias_off = true,
-       .controls = pcm3168a_snd_controls,
-       .num_controls = ARRAY_SIZE(pcm3168a_snd_controls),
-       .dapm_widgets = pcm3168a_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(pcm3168a_dapm_widgets),
-       .dapm_routes = pcm3168a_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(pcm3168a_dapm_routes)
+       .component_driver = {
+               .controls               = pcm3168a_snd_controls,
+               .num_controls           = ARRAY_SIZE(pcm3168a_snd_controls),
+               .dapm_widgets           = pcm3168a_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(pcm3168a_dapm_widgets),
+               .dapm_routes            = pcm3168a_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(pcm3168a_dapm_routes)
+       },
 };
 
 int pcm3168a_probe(struct device *dev, struct regmap *regmap)