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

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

diff --git a/sound/soc/codecs/stac9766.c b/sound/soc/codecs/stac9766.c
index 0945c51df003df37f415b4cbf9d9076826f1c7b6..2c5941f3a23405c091ff09bccb9fd2be4a69989d 100644 (file)
--- a/sound/soc/codecs/stac9766.c
+++ b/sound/soc/codecs/stac9766.c
@@ -320,8 +320,10 @@ static int stac9766_codec_remove(struct snd_soc_codec *codec)
 }
 
 static struct snd_soc_codec_driver soc_codec_dev_stac9766 = {
-       .controls = stac9766_snd_ac97_controls,
-       .num_controls = ARRAY_SIZE(stac9766_snd_ac97_controls),
+       .component_driver = {
+               .controls               = stac9766_snd_ac97_controls,
+               .num_controls           = ARRAY_SIZE(stac9766_snd_ac97_controls),
+       },
        .write = stac9766_ac97_write,
        .read = stac9766_ac97_read,
        .set_bias_level = stac9766_set_bias_level,