diff options
| author | Michal Marek <mmarek@suse.cz> | 2014-01-02 14:02:06 +0100 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2014-01-02 14:02:06 +0100 |
| commit | 37e2c2a775fc887acd1432908478dfd532f7f00f (patch) | |
| tree | e51ebc699d8e262fd47e0913be6a711cb1a7b565 /sound/pci/hda/hda_generic.h | |
| parent | deb-pkg: Inhibit initramfs builders if CONFIG_BLK_DEV_INITRD is not set (diff) | |
| parent | Linux 3.13-rc1 (diff) | |
| download | linux-37e2c2a775fc887acd1432908478dfd532f7f00f.tar.xz linux-37e2c2a775fc887acd1432908478dfd532f7f00f.zip | |
Merge commit v3.13-rc1 into kbuild/misc
Diffstat (limited to 'sound/pci/hda/hda_generic.h')
| -rw-r--r-- | sound/pci/hda/hda_generic.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_generic.h b/sound/pci/hda/hda_generic.h index 48d44026705b..7e45cb44d151 100644 --- a/sound/pci/hda/hda_generic.h +++ b/sound/pci/hda/hda_generic.h @@ -242,6 +242,9 @@ struct hda_gen_spec { /* additional mute flags (only effective with auto_mute_via_amp=1) */ u64 mute_bits; + /* bitmask for skipping volume controls */ + u64 out_vol_mask; + /* badness tables for output path evaluations */ const struct badness_table *main_out_badness; const struct badness_table *extra_out_badness; |