diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-12-20 15:42:57 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-12-20 15:42:57 +0100 |
| commit | 78c058df6a120044455b5635daefdc515bf9d899 (patch) | |
| tree | d349e70e384404a9a2d9860feb0219e9f8acb212 /sound/pci/hda/hda_codec.h | |
| parent | db9c6f842fa957b41984cd8ceea1f07c53fb3fbf (diff) | |
| parent | 31ef22579302ac42054bebecb528710f46580925 (diff) | |
| download | op-kernel-dev-78c058df6a120044455b5635daefdc515bf9d899.zip op-kernel-dev-78c058df6a120044455b5635daefdc515bf9d899.tar.gz | |
Merge branch 'test/hda-jack' into topic/hda
Conflicts:
sound/pci/hda/patch_hdmi.c
sound/pci/hda/patch_via.c
Diffstat (limited to 'sound/pci/hda/hda_codec.h')
| -rw-r--r-- | sound/pci/hda/hda_codec.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index 17cee4e..e9f71dc 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h @@ -866,6 +866,9 @@ struct hda_codec { void (*proc_widget_hook)(struct snd_info_buffer *buffer, struct hda_codec *codec, hda_nid_t nid); + /* jack detection */ + struct snd_array jacktbl; + #ifdef CONFIG_SND_HDA_INPUT_JACK /* jack detection */ struct snd_array jacks; |
