Merge remote-tracking branches 'asoc/topic/ac97', 'asoc/topic/ak4104', 'asoc/topic...

[cascardo/linux.git] / sound / soc / codecs / wm0010.c

diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c
index e3c34bd..0eb5dcf 100644 (file)
--- a/sound/soc/codecs/wm0010.c
+++ b/sound/soc/codecs/wm0010.c
@@ -789,16 +789,18 @@ static int wm0010_set_sysclk(struct snd_soc_codec *codec, int source,
 
 static int wm0010_probe(struct snd_soc_codec *codec);
 
-static struct snd_soc_codec_driver soc_codec_dev_wm0010 = {
+static const struct snd_soc_codec_driver soc_codec_dev_wm0010 = {
        .probe = wm0010_probe,
        .set_bias_level = wm0010_set_bias_level,
        .set_sysclk = wm0010_set_sysclk,
        .idle_bias_off = true,
 
-       .dapm_widgets = wm0010_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm0010_dapm_widgets),
-       .dapm_routes = wm0010_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm0010_dapm_routes),
+       .component_driver = {
+               .dapm_widgets           = wm0010_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm0010_dapm_widgets),
+               .dapm_routes            = wm0010_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm0010_dapm_routes),
+       },
 };
 
 #define WM0010_RATES (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000)