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

diff --cc sound/soc/codecs/Makefile
Simple merge

diff --cc sound/soc/codecs/sirf-audio-codec.c
index 50bc222,50bc222,01d7690,6bfd25c,6bfd25c..7ae8c18
--- 1/sound/soc/codecs/sirf-audio-codec.c
--- 2/sound/soc/codecs/sirf-audio-codec.c
--- 3/sound/soc/codecs/sirf-audio-codec.c
--- 4/sound/soc/codecs/sirf-audio-codec.c
--- 5/sound/soc/codecs/sirf-audio-codec.c
+++ b/sound/soc/codecs/sirf-audio-codec.c
@@@@@@ -429,13 -429,13 -429,15 -429,13 -429,13 +429,15 @@@@@@ static int sirf_audio_codec_remove(stru
        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,
     };