Merge remote-tracking branches 'asoc/topic/max98371', 'asoc/topic/max9867', 'asoc...

[linux-2.6-block.git] / sound / soc / codecs / max9867.c

diff --git a/sound/soc/codecs/max9867.c b/sound/soc/codecs/max9867.c
index 1aa838ff7430c17ea5507fea87829e20147e954f..42e2e407e287c4dc0354a00d864e8b997fcacbfa 100644 (file)
--- a/sound/soc/codecs/max9867.c
+++ b/sound/soc/codecs/max9867.c
@@ -416,12 +416,14 @@ static int max9867_probe(struct snd_soc_codec *codec)
 
 static struct snd_soc_codec_driver max9867_codec = {
        .probe = max9867_probe,
-       .controls = max9867_snd_controls,
-       .num_controls = ARRAY_SIZE(max9867_snd_controls),
-       .dapm_routes = max9867_audio_map,
-       .num_dapm_routes = ARRAY_SIZE(max9867_audio_map),
-       .dapm_widgets = max9867_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(max9867_dapm_widgets),
+       .component_driver = {
+               .controls               = max9867_snd_controls,
+               .num_controls           = ARRAY_SIZE(max9867_snd_controls),
+               .dapm_routes            = max9867_audio_map,
+               .num_dapm_routes        = ARRAY_SIZE(max9867_audio_map),
+               .dapm_widgets           = max9867_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(max9867_dapm_widgets),
+       },
 };
 
 static bool max9867_volatile_register(struct device *dev, unsigned int reg)