Merge remote-tracking branches 'asoc/topic/wm9090', 'asoc/topic/wm9712', 'asoc/topic...

diff --cc sound/soc/codecs/wm9712.c
Simple merge

diff --cc sound/soc/codecs/wm9713.c
Simple merge

diff --cc sound/soc/codecs/wm_adsp.c
Simple merge

diff --cc sound/soc/codecs/wm_adsp.h
index 82d651f,41cc11c,41cc11c,41cc11c,d4042c9..bc6d359
--- 1/sound/soc/codecs/wm_adsp.h
--- 2/sound/soc/codecs/wm_adsp.h
--- 3/sound/soc/codecs/wm_adsp.h
--- 4/sound/soc/codecs/wm_adsp.h
--- 5/sound/soc/codecs/wm_adsp.h
+++ b/sound/soc/codecs/wm_adsp.h
@@@@@@ -62,12 -62,12 -62,12 -62,12 -62,12 +62,12 @@@@@@ struct wm_adsp 
        int type;
        struct device *dev;
        struct regmap *regmap;
 ----   struct snd_soc_codec *codec;
 ++++   struct snd_soc_component *component;
     
----    int base;
----    int sysclk_reg;
----    int sysclk_mask;
----    int sysclk_shift;
++++    unsigned int base;
++++    unsigned int sysclk_reg;
++++    unsigned int sysclk_mask;
++++    unsigned int sysclk_shift;
     
        struct list_head alg_regions;