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

[sfrench/cifs-2.6.git] / sound / soc / codecs / ak4104.c

diff --git a/sound/soc/codecs/ak4104.c b/sound/soc/codecs/ak4104.c
index bc5c8705bd8f49f67d28fa75df139bc96764fa80..1a9d233c94d00f68f47fdc4313759666559140eb 100644 (file)
--- a/sound/soc/codecs/ak4104.c
+++ b/sound/soc/codecs/ak4104.c
@@ -248,10 +248,12 @@ static struct snd_soc_codec_driver soc_codec_device_ak4104 = {
        .suspend = ak4104_soc_suspend,
        .resume = ak4104_soc_resume,
 
-       .dapm_widgets = ak4104_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(ak4104_dapm_widgets),
-       .dapm_routes = ak4104_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(ak4104_dapm_routes),
+       .component_driver = {
+               .dapm_widgets           = ak4104_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(ak4104_dapm_widgets),
+               .dapm_routes            = ak4104_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(ak4104_dapm_routes),
+       }
 };
 
 static const struct regmap_config ak4104_regmap = {