Merge remote-tracking branches 'asoc/topic/nau8810', 'asoc/topic/of-bool', 'asoc...

[cascardo/linux.git] / sound / soc / codecs / ab8500-codec.c

diff --git a/sound/soc/codecs/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c
index 1d4059c..935ff7c 100644 (file)
--- a/sound/soc/codecs/ab8500-codec.c
+++ b/sound/soc/codecs/ab8500-codec.c
@@ -2525,12 +2525,14 @@ static int ab8500_codec_probe(struct snd_soc_codec *codec)
 
 static struct snd_soc_codec_driver ab8500_codec_driver = {
        .probe =                ab8500_codec_probe,
-       .controls =             ab8500_ctrls,
-       .num_controls =         ARRAY_SIZE(ab8500_ctrls),
-       .dapm_widgets =         ab8500_dapm_widgets,
-       .num_dapm_widgets =     ARRAY_SIZE(ab8500_dapm_widgets),
-       .dapm_routes =          ab8500_dapm_routes,
-       .num_dapm_routes =      ARRAY_SIZE(ab8500_dapm_routes),
+       .component_driver = {
+               .controls =             ab8500_ctrls,
+               .num_controls =         ARRAY_SIZE(ab8500_ctrls),
+               .dapm_widgets =         ab8500_dapm_widgets,
+               .num_dapm_widgets =     ARRAY_SIZE(ab8500_dapm_widgets),
+               .dapm_routes =          ab8500_dapm_routes,
+               .num_dapm_routes =      ARRAY_SIZE(ab8500_dapm_routes),
+       },
 };
 
 static int ab8500_codec_driver_probe(struct platform_device *pdev)