diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 11:44:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 11:44:24 -0700 |
| commit | df1efe6f871e2d3f83e6ad7b7a1d2b728b478fc2 (patch) | |
| tree | 1980e2df9bf8c5dbb1f562f09666451863662534 /include | |
| parent | 9a5467fd600669cda488771dac3e951034fe2b08 (diff) | |
| parent | 11589418a1c4cf68be9367f802898d35e07809c4 (diff) | |
| download | blackbird-op-linux-df1efe6f871e2d3f83e6ad7b7a1d2b728b478fc2.tar.gz blackbird-op-linux-df1efe6f871e2d3f83e6ad7b7a1d2b728b478fc2.zip | |
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: Export dapm_reg_event() fully
ALSA: ASoC: Update Poodle to current ASoC API
ALSA: asoc: restrict sample rate and size in Freescale MPC8610 sound drivers
ALSA: sound/soc/pxa/tosa.c: removed duplicated include
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/soc-dapm.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 3030fdc6981d..c1b26fcc0b5c 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -202,6 +202,9 @@ struct snd_soc_dapm_path; struct snd_soc_dapm_pin; struct snd_soc_dapm_route; +int dapm_reg_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event); + /* dapm controls */ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); |
