summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorJie Yang <yang.jie@intel.com>2015-04-27 16:20:59 +0300
committerTakashi Iwai <tiwai@suse.de>2015-04-27 22:37:42 +0300
commit2ba2dfa1fcc7ce5d2bf1716ec3d32b6fa0882e68 (patch)
treef6cac8ccd939ac190628dc9210d41f0ddca8419c /include/sound
parent4e3f0dc65883cac95807549b2f7a3ac183686bcb (diff)
downloadlinux-2ba2dfa1fcc7ce5d2bf1716ec3d32b6fa0882e68.tar.xz
ALSA: hda - Update to use the new jack kctls method
Jack snd_kcontrols can now be created during snd_jack_new() or by later calling snd_jack_add_new_kctls(). This patch creates the jacks during the initialisation stage for both phantom and non phantom jacks. Signed-off-by: Jie Yang <yang.jie@intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/control.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/control.h b/include/sound/control.h
index f50e2e918ceb..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);
* Helper functions for jack-detection controls
*/
struct snd_kcontrol *
-snd_kctl_jack_new(const char *name, void *private_data, struct snd_card *card);
+snd_kctl_jack_new(const char *name, struct snd_card *card);
void snd_kctl_jack_report(struct snd_card *card,
struct snd_kcontrol *kctl, bool status);