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

[deliverable/linux.git] / include / sound / soc.h

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 6ed3dc0773cc74a4912f4e7637ea4d1d74b629e1..e25416445bd7a73d6384c668d359d1fedc477467 100644 (file)
--- 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;
 };