Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next

2013-10-24 11:24:03 +01:00
parent 85eb5dce82 30a765d643
commit 0705690110
8 changed files with 279 additions and 85 deletions
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1047,7 +1047,8 @@ struct snd_soc_pcm_runtime {
 /* mixer control */
 struct soc_mixer_control {
 	int min, max, platform_max;
-	unsigned int reg, rreg, shift, rshift;
+	int reg, rreg;
+	unsigned int shift, rshift;
 	unsigned int invert:1;
 	unsigned int autodisable:1;
 };