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

1 files changed, 2 insertions, 1 deletions

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 6ed3dc0773cc..e25416445bd7 100644
--- 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;
 };