diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-04-28 02:31:31 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-04-28 02:31:31 -0400 |
| commit | 1962fcab4ee80e555bcc9d0f50e416800d474fa2 (patch) | |
| tree | 945ba95f11016871f9d5241b7da2712f9367081a /include/sound/control.h | |
| parent | f1a77547c21fe942e95ebaadbc9200f26d138574 (diff) | |
| parent | 12e180a27f3e066a4ed4a446d428fd117f168beb (diff) | |
Merge branch 'topic/jack' into for-next
Diffstat (limited to 'include/sound/control.h')
| -rw-r--r-- | include/sound/control.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/control.h b/include/sound/control.h index 95aad6d3fd1a..21d047f229a1 100644 --- a/include/sound/control.h +++ b/include/sound/control.h | |||
| @@ -252,7 +252,7 @@ void snd_ctl_sync_vmaster(struct snd_kcontrol *kctl, bool hook_only); | |||
| 252 | * Helper functions for jack-detection controls | 252 | * Helper functions for jack-detection controls |
| 253 | */ | 253 | */ |
| 254 | struct snd_kcontrol * | 254 | struct snd_kcontrol * |
| 255 | snd_kctl_jack_new(const char *name, int idx, void *private_data); | 255 | snd_kctl_jack_new(const char *name, struct snd_card *card); |
| 256 | void snd_kctl_jack_report(struct snd_card *card, | 256 | void snd_kctl_jack_report(struct snd_card *card, |
| 257 | struct snd_kcontrol *kctl, bool status); | 257 | struct snd_kcontrol *kctl, bool status); |
| 258 | 258 | ||