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

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

diff --git a/sound/soc/codecs/wm8728.c b/sound/soc/codecs/wm8728.c
index 1564e6926527f05ed892332f8ad38aea14382cef..797cc6e7c70fee2fea6547e2e76efba9a5a17b78 100644 (file)
--- a/sound/soc/codecs/wm8728.c
+++ b/sound/soc/codecs/wm8728.c
@@ -211,16 +211,18 @@ static struct snd_soc_dai_driver wm8728_dai = {
        .ops = &wm8728_dai_ops,
 };
 
-static struct snd_soc_codec_driver soc_codec_dev_wm8728 = {
+static const struct snd_soc_codec_driver soc_codec_dev_wm8728 = {
        .set_bias_level = wm8728_set_bias_level,
        .suspend_bias_off = true,
 
-       .controls = wm8728_snd_controls,
-       .num_controls = ARRAY_SIZE(wm8728_snd_controls),
-       .dapm_widgets = wm8728_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm8728_dapm_widgets),
-       .dapm_routes = wm8728_intercon,
-       .num_dapm_routes = ARRAY_SIZE(wm8728_intercon),
+       .component_driver = {
+               .controls               = wm8728_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm8728_snd_controls),
+               .dapm_widgets           = wm8728_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm8728_dapm_widgets),
+               .dapm_routes            = wm8728_intercon,
+               .num_dapm_routes        = ARRAY_SIZE(wm8728_intercon),
+       },
 };
 
 static const struct of_device_id wm8728_of_match[] = {