diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-02-12 10:34:27 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-02-12 10:34:27 +0100 |
| commit | c4d1489390aa0be73104fc502a1e3107511c8926 (patch) | |
| tree | 35adb98c98dea53be86cf8be6d15e80e2e0f52c6 /sound/pci/hda/patch_conexant.c | |
| parent | ALSA: hda - Make snd_hda_gen_spec_free() static (diff) | |
| parent | ALSA: hda - Fix undefined symbol due to builtin/module mixup (diff) | |
| download | linux-c4d1489390aa0be73104fc502a1e3107511c8926.tar.xz linux-c4d1489390aa0be73104fc502a1e3107511c8926.zip | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/pci/hda/patch_conexant.c')
| -rw-r--r-- | sound/pci/hda/patch_conexant.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 47861474fd87..59e3aeac2233 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -2883,7 +2883,8 @@ static void cxt_update_headset_mode(struct hda_codec *codec) } static void cxt_update_headset_mode_hook(struct hda_codec *codec, - struct snd_ctl_elem_value *ucontrol) + struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) { cxt_update_headset_mode(codec); } |