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

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

diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index a5a4e9f75c57f89e88f3047d980cf286f36569af..a2104d68169d9e6bc9aa30fe8269070a6dc88e40 100644 (file)
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -2199,12 +2199,14 @@ static struct snd_soc_codec_driver soc_codec_dev_twl4030 = {
        .set_bias_level = twl4030_set_bias_level,
        .idle_bias_off = true,
 
-       .controls = twl4030_snd_controls,
-       .num_controls = ARRAY_SIZE(twl4030_snd_controls),
-       .dapm_widgets = twl4030_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(twl4030_dapm_widgets),
-       .dapm_routes = intercon,
-       .num_dapm_routes = ARRAY_SIZE(intercon),
+       .component_driver = {
+               .controls               = twl4030_snd_controls,
+               .num_controls           = ARRAY_SIZE(twl4030_snd_controls),
+               .dapm_widgets           = twl4030_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(twl4030_dapm_widgets),
+               .dapm_routes            = intercon,
+               .num_dapm_routes        = ARRAY_SIZE(intercon),
+       },
 };
 
 static int twl4030_codec_probe(struct platform_device *pdev)