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

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

diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c
index fc22804cabc5942acca6921c034fa98f234041dc..72f77455582eb4ad4f76c4b0cc1713c7c007177c 100644 (file)
--- a/sound/soc/codecs/max98088.c
+++ b/sound/soc/codecs/max98088.c
@@ -1704,12 +1704,14 @@ static struct snd_soc_codec_driver soc_codec_dev_max98088 = {
        .set_bias_level = max98088_set_bias_level,
        .suspend_bias_off = true,
 
-       .controls = max98088_snd_controls,
-       .num_controls = ARRAY_SIZE(max98088_snd_controls),
-       .dapm_widgets = max98088_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(max98088_dapm_widgets),
-       .dapm_routes = max98088_audio_map,
-       .num_dapm_routes = ARRAY_SIZE(max98088_audio_map),
+       .component_driver = {
+               .controls               = max98088_snd_controls,
+               .num_controls           = ARRAY_SIZE(max98088_snd_controls),
+               .dapm_widgets           = max98088_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(max98088_dapm_widgets),
+               .dapm_routes            = max98088_audio_map,
+               .num_dapm_routes        = ARRAY_SIZE(max98088_audio_map),
+       },
 };
 
 static int max98088_i2c_probe(struct i2c_client *i2c,