Merge remote-tracking branch 'rtc/rtc-next'

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

diff --git a/sound/soc/codecs/cs4271.c b/sound/soc/codecs/cs4271.c
index 0c0010b254213f11ff19783b0ebafbd3bd37b491..8c0f3b89b5bc8a37178f6b630fc20560af742b2a 100644 (file)
--- a/sound/soc/codecs/cs4271.c
+++ b/sound/soc/codecs/cs4271.c
@@ -645,12 +645,14 @@ static struct snd_soc_codec_driver soc_codec_dev_cs4271 = {
        .suspend                = cs4271_soc_suspend,
        .resume                 = cs4271_soc_resume,
 
-       .controls               = cs4271_snd_controls,
-       .num_controls           = ARRAY_SIZE(cs4271_snd_controls),
-       .dapm_widgets           = cs4271_dapm_widgets,
-       .num_dapm_widgets       = ARRAY_SIZE(cs4271_dapm_widgets),
-       .dapm_routes            = cs4271_dapm_routes,
-       .num_dapm_routes        = ARRAY_SIZE(cs4271_dapm_routes),
+       .component_driver = {
+               .controls               = cs4271_snd_controls,
+               .num_controls           = ARRAY_SIZE(cs4271_snd_controls),
+               .dapm_widgets           = cs4271_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(cs4271_dapm_widgets),
+               .dapm_routes            = cs4271_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(cs4271_dapm_routes),
+       },
 };
 
 static int cs4271_common_probe(struct device *dev,