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

[deliverable/linux.git] / sound / soc / codecs / hdmi-codec.c

diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c
index f64ecaa0141a35aa4bf269b41b45f38ed867b0d2..b904492d774473a99d5e1aa451f18ff276f83732 100644 (file)
--- a/sound/soc/codecs/hdmi-codec.c
+++ b/sound/soc/codecs/hdmi-codec.c
@@ -375,13 +375,13 @@ static int hdmi_of_xlate_dai_name(struct snd_soc_component *component,
 }
 
 static struct snd_soc_codec_driver hdmi_codec = {
-       .controls = hdmi_controls,
-       .num_controls = ARRAY_SIZE(hdmi_controls),
-       .dapm_widgets = hdmi_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(hdmi_widgets),
-       .dapm_routes = hdmi_routes,
-       .num_dapm_routes = ARRAY_SIZE(hdmi_routes),
        .component_driver = {
+               .controls               = hdmi_controls,
+               .num_controls           = ARRAY_SIZE(hdmi_controls),
+               .dapm_widgets           = hdmi_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(hdmi_widgets),
+               .dapm_routes            = hdmi_routes,
+               .num_dapm_routes        = ARRAY_SIZE(hdmi_routes),
                .of_xlate_dai_name      = hdmi_of_xlate_dai_name,
        },
 };