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/hda_generic.h | |
| 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-dev-c4d1489390aa0be73104fc502a1e3107511c8926.tar.xz linux-dev-c4d1489390aa0be73104fc502a1e3107511c8926.zip | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/pci/hda/hda_generic.h')
| -rw-r--r-- | sound/pci/hda/hda_generic.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_generic.h b/sound/pci/hda/hda_generic.h index 9b2cbf8c1eb4..bb2dea743986 100644 --- a/sound/pci/hda/hda_generic.h +++ b/sound/pci/hda/hda_generic.h @@ -274,6 +274,7 @@ struct hda_gen_spec { void (*init_hook)(struct hda_codec *codec); void (*automute_hook)(struct hda_codec *codec); void (*cap_sync_hook)(struct hda_codec *codec, + struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); /* PCM hooks */ |