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

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

diff --git a/sound/soc/codecs/ads117x.c b/sound/soc/codecs/ads117x.c
index c5be1bdc2c9abfbeb61082e118fa2971db1258af..90c756d183b46168204839e56ae117694116a37c 100644 (file)
--- a/sound/soc/codecs/ads117x.c
+++ b/sound/soc/codecs/ads117x.c
@@ -59,10 +59,12 @@ static struct snd_soc_dai_driver ads117x_dai = {
 };
 
 static struct snd_soc_codec_driver soc_codec_dev_ads117x = {
-       .dapm_widgets = ads117x_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(ads117x_dapm_widgets),
-       .dapm_routes = ads117x_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(ads117x_dapm_routes),
+       .component_driver = {
+               .dapm_widgets           = ads117x_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(ads117x_dapm_widgets),
+               .dapm_routes            = ads117x_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(ads117x_dapm_routes),
+       },
 };
 
 static int ads117x_probe(struct platform_device *pdev)