projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'xfs-for-linus-v3.13-rc1' of git://oss.sgi.com/xfs/xfs
[firefly-linux-kernel-4.4.55.git]
/
include
/
sound
/
soc.h
diff --git
a/include/sound/soc.h
b/include/sound/soc.h
index fbea72f9cc661212aa68f4a9a02a1cb6eeaaf982..1f741cb24f337c3e4662c2ff2cd45f78985c54c1 100644
(file)
--- a/
include/sound/soc.h
+++ b/
include/sound/soc.h
@@
-1051,7
+1051,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;
};