Merge branch 'test/hda-jack' into topic/hda

Conflicts:
	sound/pci/hda/patch_hdmi.c
	sound/pci/hda/patch_via.c

1 files changed, 3 insertions, 0 deletions

diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index 17cee4ee8e6..e9f71dc0d46 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;