Merge remote-tracking branch 'sound-asoc/for-next'

[deliverable/linux.git] / sound / soc / atmel / atmel-classd.c

diff --git a/sound/soc/atmel/atmel-classd.c b/sound/soc/atmel/atmel-classd.c
index 6d9b8b44e2dae93feedc644f0a0568c3dd883927..89ac5f5a93eb31f510d8ab189badc781fd319e6f 100644 (file)
--- a/sound/soc/atmel/atmel-classd.c
+++ b/sound/soc/atmel/atmel-classd.c
@@ -308,9 +308,11 @@ static struct regmap *atmel_classd_codec_get_remap(struct device *dev)
 
 static struct snd_soc_codec_driver soc_codec_dev_classd = {
        .probe          = atmel_classd_codec_probe,
-       .controls       = atmel_classd_snd_controls,
-       .num_controls   = ARRAY_SIZE(atmel_classd_snd_controls),
        .get_regmap     = atmel_classd_codec_get_remap,
+       .component_driver = {
+               .controls               = atmel_classd_snd_controls,
+               .num_controls           = ARRAY_SIZE(atmel_classd_snd_controls),
+       },
 };
 
 /* codec dai component */