diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-27 13:36:25 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-27 13:36:25 +0100 |
| commit | cc0db22afd9b963a4a78b634d360033bdda37650 (patch) | |
| tree | ceca2e3abe13a0c549432565f3b0f9e35aedda5b /sound/pci/hda/hda_codec.h | |
| parent | fdfa68298816192d47fc7443d1e2f00fa1420985 (diff) | |
| parent | 54f7190b23080c7ac32078ed6a346bdc591ebef1 (diff) | |
| download | op-kernel-dev-cc0db22afd9b963a4a78b634d360033bdda37650.zip op-kernel-dev-cc0db22afd9b963a4a78b634d360033bdda37650.tar.gz | |
Merge branch 'fix/hda' into for-linus
Diffstat (limited to 'sound/pci/hda/hda_codec.h')
| -rw-r--r-- | sound/pci/hda/hda_codec.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index 1d541b7..0a770a2 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h @@ -817,6 +817,7 @@ struct hda_codec { unsigned int pin_amp_workaround:1; /* pin out-amp takes index * (e.g. Conexant codecs) */ + unsigned int no_trigger_sense:1; /* don't trigger at pin-sensing */ #ifdef CONFIG_SND_HDA_POWER_SAVE unsigned int power_on :1; /* current (global) power-state */ unsigned int power_transition :1; /* power-state in transition */ |
