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

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

diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c
index e07807d96b68069b10c0e1319359b8ed52905ecc..18baea2f7d654528cf52617bfb0c58fc2e3b8efe 100644 (file)
--- a/sound/soc/codecs/cs4270.c
+++ b/sound/soc/codecs/cs4270.c
@@ -617,12 +617,14 @@ static const struct snd_soc_codec_driver soc_codec_device_cs4270 = {
        .suspend =              cs4270_soc_suspend,
        .resume =               cs4270_soc_resume,
 
-       .controls =             cs4270_snd_controls,
-       .num_controls =         ARRAY_SIZE(cs4270_snd_controls),
-       .dapm_widgets =         cs4270_dapm_widgets,
-       .num_dapm_widgets =     ARRAY_SIZE(cs4270_dapm_widgets),
-       .dapm_routes =          cs4270_dapm_routes,
-       .num_dapm_routes =      ARRAY_SIZE(cs4270_dapm_routes),
+       .component_driver = {
+               .controls =             cs4270_snd_controls,
+               .num_controls =         ARRAY_SIZE(cs4270_snd_controls),
+               .dapm_widgets =         cs4270_dapm_widgets,
+               .num_dapm_widgets =     ARRAY_SIZE(cs4270_dapm_widgets),
+               .dapm_routes =          cs4270_dapm_routes,
+               .num_dapm_routes =      ARRAY_SIZE(cs4270_dapm_routes),
+       },
 };
 
 /*