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

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

diff --git a/sound/soc/codecs/adau7002.c b/sound/soc/codecs/adau7002.c
index 9df72c6adcca9890cf1e9ff6f7d80e0b5a88e9a9..6384c5491de8e53d1fb94aa136cb37b0d916f31d 100644 (file)
--- a/sound/soc/codecs/adau7002.c
+++ b/sound/soc/codecs/adau7002.c
@@ -39,10 +39,12 @@ static struct snd_soc_dai_driver adau7002_dai = {
 };
 
 static const struct snd_soc_codec_driver adau7002_codec_driver = {
-       .dapm_widgets = adau7002_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(adau7002_widgets),
-       .dapm_routes = adau7002_routes,
-       .num_dapm_routes = ARRAY_SIZE(adau7002_routes),
+       .component_driver = {
+               .dapm_widgets           = adau7002_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(adau7002_widgets),
+               .dapm_routes            = adau7002_routes,
+               .num_dapm_routes        = ARRAY_SIZE(adau7002_routes),
+       },
 };
 
 static int adau7002_probe(struct platform_device *pdev)