Merge remote-tracking branches 'asoc/topic/tpa6130a2', 'asoc/topic/ux500', 'asoc...

[sfrench/cifs-2.6.git] / sound / soc / codecs / wm8991.c

diff --git a/sound/soc/codecs/wm8991.c b/sound/soc/codecs/wm8991.c
index 9d4b6076e9a8912e3b1f4fa3f4b41c0638b7b4bc..802c0694e5c3c51543d7a1ad36f41e77ad68a4fd 100644 (file)
--- a/sound/soc/codecs/wm8991.c
+++ b/sound/soc/codecs/wm8991.c
@@ -1242,16 +1242,18 @@ static struct snd_soc_dai_driver wm8991_dai = {
        .ops = &wm8991_ops
 };
 
-static struct snd_soc_codec_driver soc_codec_dev_wm8991 = {
+static const struct snd_soc_codec_driver soc_codec_dev_wm8991 = {
        .set_bias_level = wm8991_set_bias_level,
        .suspend_bias_off = true,
 
-       .controls = wm8991_snd_controls,
-       .num_controls = ARRAY_SIZE(wm8991_snd_controls),
-       .dapm_widgets = wm8991_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm8991_dapm_widgets),
-       .dapm_routes = wm8991_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm8991_dapm_routes),
+       .component_driver = {
+               .controls               = wm8991_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm8991_snd_controls),
+               .dapm_widgets           = wm8991_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm8991_dapm_widgets),
+               .dapm_routes            = wm8991_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm8991_dapm_routes),
+       },
 };
 
 static const struct regmap_config wm8991_regmap = {