diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-12-20 15:42:57 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-12-20 15:42:57 +0100 |
| commit | 78c058df6a120044455b5635daefdc515bf9d899 (patch) | |
| tree | d349e70e384404a9a2d9860feb0219e9f8acb212 /include | |
| parent | db9c6f842fa957b41984cd8ceea1f07c53fb3fbf (diff) | |
| parent | 31ef22579302ac42054bebecb528710f46580925 (diff) | |
Merge branch 'test/hda-jack' into topic/hda
Conflicts:
sound/pci/hda/patch_hdmi.c
sound/pci/hda/patch_via.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/control.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/sound/control.h b/include/sound/control.h index 1a94a216ed99..b2796e83c7ac 100644 --- a/include/sound/control.h +++ b/include/sound/control.h @@ -227,4 +227,12 @@ snd_ctl_add_slave_uncached(struct snd_kcontrol *master, return _snd_ctl_add_slave(master, slave, SND_CTL_SLAVE_NEED_UPDATE); } +/* + * Helper functions for jack-detection controls + */ +struct snd_kcontrol * +snd_kctl_jack_new(const char *name, int idx, void *private_data); +void snd_kctl_jack_report(struct snd_card *card, + struct snd_kcontrol *kctl, bool status); + #endif /* __SOUND_CONTROL_H */ |