diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-01-12 03:59:18 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-01-12 03:59:18 -0500 |
| commit | 9e4ce164ee3a1d07580f017069c25d180b0aa785 (patch) | |
| tree | 7569661eae727a5a349e4c98dba42ca681857462 /include | |
| parent | 627b79628f56c3deeb17dec1edf6899b49552fa4 (diff) | |
| parent | f2cbba7602383cd9cdd21f0a5d0b8bd1aad47b33 (diff) | |
Merge branch 'topic/hda' into for-linus
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, | |||
| 227 | return _snd_ctl_add_slave(master, slave, SND_CTL_SLAVE_NEED_UPDATE); | 227 | return _snd_ctl_add_slave(master, slave, SND_CTL_SLAVE_NEED_UPDATE); |
| 228 | } | 228 | } |
| 229 | 229 | ||
| 230 | /* | ||
| 231 | * Helper functions for jack-detection controls | ||
| 232 | */ | ||
| 233 | struct snd_kcontrol * | ||
| 234 | snd_kctl_jack_new(const char *name, int idx, void *private_data); | ||
| 235 | void snd_kctl_jack_report(struct snd_card *card, | ||
| 236 | struct snd_kcontrol *kctl, bool status); | ||
| 237 | |||
| 230 | #endif /* __SOUND_CONTROL_H */ | 238 | #endif /* __SOUND_CONTROL_H */ |