From: Mark Brown <broonie@kernel.org>
Date: Fri, 5 Jun 2015 17:55:05 +0000 (+0100)
Subject: Merge remote-tracking branches 'asoc/topic/topology', 'asoc/topic/twl6040', 'asoc... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=28bedc59469e869c1ed9c30384d61798d6c3eb5c;p=linux-beck.git

Merge remote-tracking branches 'asoc/topic/topology', 'asoc/topic/twl6040', 'asoc/topic/wm5100', 'asoc/topic/wm8741' and 'asoc/topic/wm8960' into asoc-next
---

28bedc59469e869c1ed9c30384d61798d6c3eb5c
diff --cc include/sound/soc.h
index f10f48fad5d5,bfd84a7edfa5,fcb312b3f258,fcb312b3f258,fcb312b3f258,fcb312b3f258..93df8bf9d54a
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@@@@@@ -1212,7 -1207,8 -1188,6 -1188,6 -1188,6 -1188,6 +1222,8 @@@@@@@ struct soc_enum 
      	unsigned int mask;
      	const char * const *texts;
      	const unsigned int *values;
  ++++	unsigned int autodisable:1;
+ ++++	struct snd_soc_dobj dobj;
      };
      
      /**