Merge remote-tracking branch 'omap_dss2/for-next'

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

diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c
index bd9dcd2161bc9cb394d9aa40833b6221a44420a1..0da2bbaf06d1f33e89b48497865d477d58696e1c 100644 (file)
--- a/sound/soc/codecs/wm8750.c
+++ b/sound/soc/codecs/wm8750.c
@@ -708,17 +708,19 @@ static int wm8750_probe(struct snd_soc_codec *codec)
        return ret;
 }
 
-static struct snd_soc_codec_driver soc_codec_dev_wm8750 = {
+static const struct snd_soc_codec_driver soc_codec_dev_wm8750 = {
        .probe =        wm8750_probe,
        .set_bias_level = wm8750_set_bias_level,
        .suspend_bias_off = true,
 
-       .controls = wm8750_snd_controls,
-       .num_controls = ARRAY_SIZE(wm8750_snd_controls),
-       .dapm_widgets = wm8750_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm8750_dapm_widgets),
-       .dapm_routes = wm8750_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm8750_dapm_routes),
+       .component_driver = {
+               .controls               = wm8750_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm8750_snd_controls),
+               .dapm_widgets           = wm8750_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm8750_dapm_widgets),
+               .dapm_routes            = wm8750_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm8750_dapm_routes),
+       },
 };
 
 static const struct of_device_id wm8750_of_match[] = {