diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-04-07 12:26:55 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-04-07 12:26:55 +0200 |
| commit | 5ff5c3a4ab0d638fa63e939e75727c233b681e8d (patch) | |
| tree | a62c2f95c31130c74beef53910cf66023765f355 /sound/pci/hda/hda_codec.h | |
| parent | 18dcd3044e4c4b3ab6341c98e8d0e81e0d58d5e3 (diff) | |
| parent | 250f32747e62cb415b85083e247184188f24e566 (diff) | |
| download | blackbird-op-linux-5ff5c3a4ab0d638fa63e939e75727c233b681e8d.tar.gz blackbird-op-linux-5ff5c3a4ab0d638fa63e939e75727c233b681e8d.zip | |
Merge branch 'fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_conexant.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 9a9f372e1be4..56b4f74c0b13 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h @@ -851,6 +851,9 @@ struct hda_codec { unsigned int pin_amp_workaround:1; /* pin out-amp takes index * (e.g. Conexant codecs) */ + unsigned int single_adc_amp:1; /* adc in-amp takes no index + * (e.g. CX20549 codec) + */ unsigned int no_sticky_stream:1; /* no sticky-PCM stream assignment */ unsigned int pins_shutup:1; /* pins are shut up */ unsigned int no_trigger_sense:1; /* don't trigger at pin-sensing */ |
