Merge git://www.linux-watchdog.org/linux-watchdog

[karo-tx-linux.git] / sound / soc / codecs / wm1250-ev1.c

diff --git a/sound/soc/codecs/wm1250-ev1.c b/sound/soc/codecs/wm1250-ev1.c
index ec45c5b220b100263f380800f1cc27f731861ffc..cf5f0580df6a852225ef70f39a6af22fe1255cc9 100644 (file)
--- a/sound/soc/codecs/wm1250-ev1.c
+++ b/sound/soc/codecs/wm1250-ev1.c
@@ -141,12 +141,13 @@ static struct snd_soc_dai_driver wm1250_ev1_dai = {
        .ops = &wm1250_ev1_ops,
 };
 
-static struct snd_soc_codec_driver soc_codec_dev_wm1250_ev1 = {
-       .dapm_widgets = wm1250_ev1_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm1250_ev1_dapm_widgets),
-       .dapm_routes = wm1250_ev1_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm1250_ev1_dapm_routes),
-
+static const struct snd_soc_codec_driver soc_codec_dev_wm1250_ev1 = {
+       .component_driver = {
+               .dapm_widgets           = wm1250_ev1_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm1250_ev1_dapm_widgets),
+               .dapm_routes            = wm1250_ev1_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm1250_ev1_dapm_routes),
+       },
        .set_bias_level = wm1250_ev1_set_bias_level,
        .idle_bias_off = true,
 };