From: Mark Brown <broonie@kernel.org>
Date: Wed, 4 Feb 2015 20:57:24 +0000 (+0000)
Subject: Merge remote-tracking branches 'asoc/topic/txx9', 'asoc/topic/wm8750', 'asoc/topic... 
X-Git-Tag: v4.0-rc1~129^2~22^2~1
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=dacff834fa20b213c258175b7745a55eb35ea5b3

Merge remote-tracking branches 'asoc/topic/txx9', 'asoc/topic/wm8750', 'asoc/topic/wm8804' and 'asoc/topic/wm8904' into asoc-next
---

dacff834fa20b213c258175b7745a55eb35ea5b3
diff --cc sound/soc/codecs/wm8995.c
index 79e1aead5131,c280f0a3a424,1288edeb8c7d,120228b6b596,c280f0a3a424..66103c2b012e
--- a/sound/soc/codecs/wm8995.c
+++ b/sound/soc/codecs/wm8995.c
@@@@@@ -2191,16 -2195,16 -2205,9 -2195,16 -2195,16 +2191,16 @@@@@@ static const struct snd_soc_codec_drive
     	.remove = wm8995_remove,
     	.set_bias_level = wm8995_set_bias_level,
     	.idle_bias_off = true,
  +  
  +  	.controls = wm8995_snd_controls,
  +  	.num_controls = ARRAY_SIZE(wm8995_snd_controls),
  +  	.dapm_widgets = wm8995_dapm_widgets,
  +  	.num_dapm_widgets = ARRAY_SIZE(wm8995_dapm_widgets),
  +  	.dapm_routes = wm8995_intercon,
  +  	.num_dapm_routes = ARRAY_SIZE(wm8995_intercon),
     };
     
--- -static struct regmap_config wm8995_regmap = {
+++ +static const struct regmap_config wm8995_regmap = {
     	.reg_bits = 16,
     	.val_bits = 16,