diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-24 11:24:03 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-24 11:24:03 +0100 |
| commit | 07056901106b71c69623a224bbb16e83585e5530 (patch) | |
| tree | 7b7b39d7ad28522e8af7aaaa630729f13a44bce0 /include/sound/soc.h | |
| parent | 85eb5dce82e0cd6540384116b8e89e98290cccb8 (diff) | |
| parent | 30a765d6433413c0eba90c969eecf12dfa2d111a (diff) | |
| download | blackbird-op-linux-07056901106b71c69623a224bbb16e83585e5530.tar.gz blackbird-op-linux-07056901106b71c69623a224bbb16e83585e5530.zip | |
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
Diffstat (limited to 'include/sound/soc.h')
| -rw-r--r-- | include/sound/soc.h | 3 |
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; }; |
