diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-10-31 09:39:49 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-10-31 09:39:49 -0400 |
| commit | 04172c0b9ea5861e5cba7909da5297b3aedac9e1 (patch) | |
| tree | 5a993adb827ae676166ad11f7510ff57ebda46b8 /include/sound | |
| parent | 5b99e6ccf964e733f0afe2b7bd09559a51a540ca (diff) | |
| parent | 13d622b33dfbd99205a7add5751ba47445e480a6 (diff) | |
Merge branch 'topic/fix/asoc' into topic/asoc
Diffstat (limited to 'include/sound')
| -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 @@ | |||
| 28 | */ | 28 | */ |
| 29 | #define SOC_SINGLE_VALUE(xreg, xshift, xmax, xinvert) \ | 29 | #define SOC_SINGLE_VALUE(xreg, xshift, xmax, xinvert) \ |
| 30 | ((unsigned long)&(struct soc_mixer_control) \ | 30 | ((unsigned long)&(struct soc_mixer_control) \ |
| 31 | {.reg = xreg, .shift = xshift, .max = xmax, .invert = xinvert}) | 31 | {.reg = xreg, .shift = xshift, .rshift = xshift, .max = xmax, \ |
| 32 | .invert = xinvert}) | ||
| 32 | #define SOC_SINGLE_VALUE_EXT(xreg, xmax, xinvert) \ | 33 | #define SOC_SINGLE_VALUE_EXT(xreg, xmax, xinvert) \ |
| 33 | ((unsigned long)&(struct soc_mixer_control) \ | 34 | ((unsigned long)&(struct soc_mixer_control) \ |
| 34 | {.reg = xreg, .max = xmax, .invert = xinvert}) | 35 | {.reg = xreg, .max = xmax, .invert = xinvert}) |