diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-03-16 17:38:46 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-03-16 17:38:46 +0100 |
| commit | 433e8327caf9f7c0432b2f2f6684a5b79cfe18e9 (patch) | |
| tree | 515e7bb9b0169fc4f8c1422ef6c926d4bd63e808 /sound/pci/hda/hda_codec.h | |
| parent | 27b92d4ff2be2359a21ff4acde5b63563ff720e2 (diff) | |
| parent | cc90fd725e14020607c5a6ba3ea02a0ddec5655f (diff) | |
Merge branch 'topic/hda' into for-linus
Diffstat (limited to 'sound/pci/hda/hda_codec.h')
| -rw-r--r-- | sound/pci/hda/hda_codec.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index fdf8d44f8b6b..e46d5420a9f2 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h @@ -866,6 +866,11 @@ struct hda_codec { /* codec-specific additional proc output */ void (*proc_widget_hook)(struct snd_info_buffer *buffer, struct hda_codec *codec, hda_nid_t nid); + +#ifdef CONFIG_SND_HDA_INPUT_JACK + /* jack detection */ + struct snd_array jacks; +#endif }; /* direction */ |