diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-07-18 15:53:06 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-07-18 15:53:06 +0400 |
| commit | 61eab000f3536f080eab43fd5eed3fd817ded76e (patch) | |
| tree | d1448b3b90c5650b522c8d13d8bdd7bd65a5cf52 /sound/pci/hda/hda_jack.h | |
| parent | 68e67f40b7343383517c3f951b4b8db7626406bc (diff) | |
| parent | 4e01ec636e64707d202a1ca21a47bbc6d53085b7 (diff) | |
| download | linux-61eab000f3536f080eab43fd5eed3fd817ded76e.tar.xz | |
Merge branch 'topic/hda' into for-next
This is a large chunk merge for 3.6 HD-audio things
Diffstat (limited to 'sound/pci/hda/hda_jack.h')
| -rw-r--r-- | sound/pci/hda/hda_jack.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_jack.h b/sound/pci/hda/hda_jack.h index 8ae52465ec5d..a9803da633c0 100644 --- a/sound/pci/hda/hda_jack.h +++ b/sound/pci/hda/hda_jack.h @@ -23,6 +23,7 @@ struct hda_jack_tbl { unsigned int pin_sense; /* cached pin-sense value */ unsigned int jack_detect:1; /* capable of jack-detection? */ unsigned int jack_dirty:1; /* needs to update? */ + unsigned int phantom_jack:1; /* a fixed, always present port? */ struct snd_kcontrol *kctl; /* assigned kctl for jack-detection */ #ifdef CONFIG_SND_HDA_INPUT_JACK int type; |