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

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

diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c
index 363b3b6676163e8c0b110efd165c5eccd7ec9e1a..856867ec2813486eafb1399b22c2e8e4af5fc474 100644 (file)
--- a/sound/soc/codecs/wm9081.c
+++ b/sound/soc/codecs/wm9081.c
@@ -1274,7 +1274,7 @@ static int wm9081_probe(struct snd_soc_codec *codec)
        return 0;
 }
 
-static struct snd_soc_codec_driver soc_codec_dev_wm9081 = {
+static const struct snd_soc_codec_driver soc_codec_dev_wm9081 = {
        .probe =        wm9081_probe,
 
        .set_sysclk = wm9081_set_sysclk,
@@ -1282,12 +1282,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm9081 = {
 
        .idle_bias_off = true,
 
-       .controls         = wm9081_snd_controls,
-       .num_controls     = ARRAY_SIZE(wm9081_snd_controls),
-       .dapm_widgets     = wm9081_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm9081_dapm_widgets),
-       .dapm_routes     = wm9081_audio_paths,
-       .num_dapm_routes = ARRAY_SIZE(wm9081_audio_paths),
+       .component_driver = {
+               .controls               = wm9081_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm9081_snd_controls),
+               .dapm_widgets           = wm9081_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm9081_dapm_widgets),
+               .dapm_routes            = wm9081_audio_paths,
+               .num_dapm_routes        = ARRAY_SIZE(wm9081_audio_paths),
+       },
 };
 
 static const struct regmap_config wm9081_regmap = {