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

[deliverable/linux.git] / sound / soc / codecs / bt-sco.c

diff --git a/sound/soc/codecs/bt-sco.c b/sound/soc/codecs/bt-sco.c
index 2a8d0ee141d414228bb8cc1d67994416b0a7cd25..8014e697d5407d0b43f3bf03089a349c31e0b03a 100644 (file)
--- a/sound/soc/codecs/bt-sco.c
+++ b/sound/soc/codecs/bt-sco.c
@@ -63,10 +63,12 @@ static struct snd_soc_dai_driver bt_sco_dai[] = {
 };
 
 static struct snd_soc_codec_driver soc_codec_dev_bt_sco = {
-       .dapm_widgets = bt_sco_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(bt_sco_widgets),
-       .dapm_routes = bt_sco_routes,
-       .num_dapm_routes = ARRAY_SIZE(bt_sco_routes),
+       .component_driver = {
+               .dapm_widgets           = bt_sco_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(bt_sco_widgets),
+               .dapm_routes            = bt_sco_routes,
+               .num_dapm_routes        = ARRAY_SIZE(bt_sco_routes),
+       },
 };
 
 static int bt_sco_probe(struct platform_device *pdev)