diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-13 12:49:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-13 12:49:06 -0400 |
| commit | 5dc93cf4576125f07cfc1b29cab0c9344c5b3d2b (patch) | |
| tree | d72e52a182e1b90d5834c7707857732795d433ef /include | |
| parent | 43f14d856f013a4cc63da2c765617c665274338c (diff) | |
| parent | 3c17279137bf8318438510b48229d4236f773da4 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
[ALSA] ASoC: Fix wrong enum count for jack_function in N810 machine driver
[ALSA] ASoC: build fix for snd_soc_info_bool_ext
[ALSA] ASoC: Fix TLV320AIC3X mono line output interconnect
[ALSA] soc - fsl_ssi.c fix "BUG: scheduling while atomic"
[ALSA] emux midi synthesizer doesn't honor SOFT_PEDAL-release event
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/soc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index e6ea6f750941..d3c8c033dff8 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h | |||
| @@ -238,7 +238,7 @@ int snd_soc_info_volsw(struct snd_kcontrol *kcontrol, | |||
| 238 | struct snd_ctl_elem_info *uinfo); | 238 | struct snd_ctl_elem_info *uinfo); |
| 239 | int snd_soc_info_volsw_ext(struct snd_kcontrol *kcontrol, | 239 | int snd_soc_info_volsw_ext(struct snd_kcontrol *kcontrol, |
| 240 | struct snd_ctl_elem_info *uinfo); | 240 | struct snd_ctl_elem_info *uinfo); |
| 241 | #define snd_soc_info_bool_ext snd_ctl_boolean_mono | 241 | #define snd_soc_info_bool_ext snd_ctl_boolean_mono_info |
| 242 | int snd_soc_get_volsw(struct snd_kcontrol *kcontrol, | 242 | int snd_soc_get_volsw(struct snd_kcontrol *kcontrol, |
| 243 | struct snd_ctl_elem_value *ucontrol); | 243 | struct snd_ctl_elem_value *ucontrol); |
| 244 | int snd_soc_put_volsw(struct snd_kcontrol *kcontrol, | 244 | int snd_soc_put_volsw(struct snd_kcontrol *kcontrol, |