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

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

diff --git a/sound/soc/codecs/lm49453.c b/sound/soc/codecs/lm49453.c
index 9af5640e3446be9b8cb770193e1dbeedef355911..8d413c2677ccad5287d06a41d33c586296056985 100644 (file)
--- a/sound/soc/codecs/lm49453.c
+++ b/sound/soc/codecs/lm49453.c
@@ -1391,12 +1391,14 @@ static struct snd_soc_dai_driver lm49453_dai[] = {
 
 static struct snd_soc_codec_driver soc_codec_dev_lm49453 = {
        .set_bias_level = lm49453_set_bias_level,
-       .controls = lm49453_snd_controls,
-       .num_controls = ARRAY_SIZE(lm49453_snd_controls),
-       .dapm_widgets = lm49453_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(lm49453_dapm_widgets),
-       .dapm_routes = lm49453_audio_map,
-       .num_dapm_routes = ARRAY_SIZE(lm49453_audio_map),
+       .component_driver = {
+               .controls               = lm49453_snd_controls,
+               .num_controls           = ARRAY_SIZE(lm49453_snd_controls),
+               .dapm_widgets           = lm49453_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(lm49453_dapm_widgets),
+               .dapm_routes            = lm49453_audio_map,
+               .num_dapm_routes        = ARRAY_SIZE(lm49453_audio_map),
+       },
        .idle_bias_off = true,
 };