Merge remote-tracking branch 'xen-tip/linux-next'

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

diff --git a/sound/soc/codecs/spdif_transmitter.c b/sound/soc/codecs/spdif_transmitter.c
index ef634a9ad673a599329dbb5f6a5cad3a95d2c7af..ee367536a4980a930984f386e515a84f3517de9f 100644 (file)
--- a/sound/soc/codecs/spdif_transmitter.c
+++ b/sound/soc/codecs/spdif_transmitter.c
@@ -38,10 +38,12 @@ static const struct snd_soc_dapm_route dit_routes[] = {
 };
 
 static struct snd_soc_codec_driver soc_codec_spdif_dit = {
-       .dapm_widgets = dit_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(dit_widgets),
-       .dapm_routes = dit_routes,
-       .num_dapm_routes = ARRAY_SIZE(dit_routes),
+       .component_driver = {
+               .dapm_widgets           = dit_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(dit_widgets),
+               .dapm_routes            = dit_routes,
+               .num_dapm_routes        = ARRAY_SIZE(dit_routes),
+       },
 };
 
 static struct snd_soc_dai_driver dit_stub_dai = {