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

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

diff --git a/sound/soc/codecs/wm8727.c b/sound/soc/codecs/wm8727.c
index bb25a75f92a22749c47685e9373b7763c28af0e4..7fde077a014be3f59af9d03ddbeaf22d048d91ab 100644 (file)
--- a/sound/soc/codecs/wm8727.c
+++ b/sound/soc/codecs/wm8727.c
@@ -53,11 +53,13 @@ static struct snd_soc_dai_driver wm8727_dai = {
                },
 };
 
-static struct snd_soc_codec_driver soc_codec_dev_wm8727 = {
-       .dapm_widgets = wm8727_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm8727_dapm_widgets),
-       .dapm_routes = wm8727_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm8727_dapm_routes),
+static const struct snd_soc_codec_driver soc_codec_dev_wm8727 = {
+       .component_driver = {
+               .dapm_widgets           = wm8727_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm8727_dapm_widgets),
+               .dapm_routes            = wm8727_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm8727_dapm_routes),
+       },
 };
 
 static int wm8727_probe(struct platform_device *pdev)