Merge remote-tracking branch 'spi/for-next'

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

diff --git a/sound/soc/codecs/max98357a.c b/sound/soc/codecs/max98357a.c
index 5b1dfb1518fbeaa151da656fc5d3e1198ad681ed..6a6b68a4cb527fc389b61d6e70524f13f11b3b5a 100644 (file)
--- a/sound/soc/codecs/max98357a.c
+++ b/sound/soc/codecs/max98357a.c
@@ -74,10 +74,12 @@ static int max98357a_codec_probe(struct snd_soc_codec *codec)
 
 static struct snd_soc_codec_driver max98357a_codec_driver = {
        .probe                  = max98357a_codec_probe,
-       .dapm_widgets           = max98357a_dapm_widgets,
-       .num_dapm_widgets       = ARRAY_SIZE(max98357a_dapm_widgets),
-       .dapm_routes            = max98357a_dapm_routes,
-       .num_dapm_routes        = ARRAY_SIZE(max98357a_dapm_routes),
+       .component_driver = {
+               .dapm_widgets           = max98357a_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(max98357a_dapm_widgets),
+               .dapm_routes            = max98357a_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(max98357a_dapm_routes),
+       },
 };
 
 static const struct snd_soc_dai_ops max98357a_dai_ops = {