Merge remote-tracking branch 'sound-asoc/for-next'

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

diff --git a/sound/soc/codecs/wm8782.c b/sound/soc/codecs/wm8782.c
index fb55fd845d273fc9fa41670e41568379f346e9ec..bcda210185050a0ddc3901ba244f0bbdc70dfee8 100644 (file)
--- a/sound/soc/codecs/wm8782.c
+++ b/sound/soc/codecs/wm8782.c
@@ -50,11 +50,13 @@ static struct snd_soc_dai_driver wm8782_dai = {
        },
 };
 
-static struct snd_soc_codec_driver soc_codec_dev_wm8782 = {
-       .dapm_widgets = wm8782_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm8782_dapm_widgets),
-       .dapm_routes = wm8782_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm8782_dapm_routes),
+static const struct snd_soc_codec_driver soc_codec_dev_wm8782 = {
+       .component_driver = {
+               .dapm_widgets           = wm8782_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm8782_dapm_widgets),
+               .dapm_routes            = wm8782_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm8782_dapm_routes),
+       },
 };
 
 static int wm8782_probe(struct platform_device *pdev)