Merge remote-tracking branches 'asoc/topic/blackfin', 'asoc/topic/build', 'asoc/topic...

[linux-2.6-microblaze.git] / sound / soc / codecs / sirf-audio-codec.c

diff --git a/sound/soc/codecs/sirf-audio-codec.c b/sound/soc/codecs/sirf-audio-codec.c
index 6bfd25c..7ae8c18 100644 (file)
--- a/sound/soc/codecs/sirf-audio-codec.c
+++ b/sound/soc/codecs/sirf-audio-codec.c
@@ -429,13 +429,15 @@ static int sirf_audio_codec_remove(struct snd_soc_codec *codec)
        return 0;
 }
 
-static struct snd_soc_codec_driver soc_codec_device_sirf_audio_codec = {
+static const struct snd_soc_codec_driver soc_codec_device_sirf_audio_codec = {
        .probe = sirf_audio_codec_probe,
        .remove = sirf_audio_codec_remove,
-       .dapm_widgets = sirf_audio_codec_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(sirf_audio_codec_dapm_widgets),
-       .dapm_routes = sirf_audio_codec_map,
-       .num_dapm_routes = ARRAY_SIZE(sirf_audio_codec_map),
+       .component_driver = {
+               .dapm_widgets = sirf_audio_codec_dapm_widgets,
+               .num_dapm_widgets = ARRAY_SIZE(sirf_audio_codec_dapm_widgets),
+               .dapm_routes = sirf_audio_codec_map,
+               .num_dapm_routes = ARRAY_SIZE(sirf_audio_codec_map),
+       },
        .idle_bias_off = true,
 };