diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-10-31 14:39:49 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-10-31 14:39:49 +0100 |
commit | 04172c0b9ea5861e5cba7909da5297b3aedac9e1 (patch) | |
tree | 5a993adb827ae676166ad11f7510ff57ebda46b8 /include/sound/soc.h | |
parent | 5b99e6ccf964e733f0afe2b7bd09559a51a540ca (diff) | |
parent | 13d622b33dfbd99205a7add5751ba47445e480a6 (diff) | |
download | linux-04172c0b9ea5861e5cba7909da5297b3aedac9e1.tar.gz linux-04172c0b9ea5861e5cba7909da5297b3aedac9e1.tar.bz2 linux-04172c0b9ea5861e5cba7909da5297b3aedac9e1.zip |
Merge branch 'topic/fix/asoc' into topic/asoc
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 d33825d624a5..da0040b69c2d 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -28,7 +28,8 @@ */ #define SOC_SINGLE_VALUE(xreg, xshift, xmax, xinvert) \ ((unsigned long)&(struct soc_mixer_control) \ - {.reg = xreg, .shift = xshift, .max = xmax, .invert = xinvert}) + {.reg = xreg, .shift = xshift, .rshift = xshift, .max = xmax, \ + .invert = xinvert}) #define SOC_SINGLE_VALUE_EXT(xreg, xmax, xinvert) \ ((unsigned long)&(struct soc_mixer_control) \ {.reg = xreg, .max = xmax, .invert = xinvert}) |