diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-11 11:17:15 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-11 11:17:15 +0100 |
| commit | c34c0d7684b8b79666da6b1bc37fc330cd0dd216 (patch) | |
| tree | c2bc72d67862df770af45a88814759baa0744d2c /sound/pci/hda/hda_generic.h | |
| parent | 29dc5dd229dc3130b51df0932e59946fc09d3bd4 (diff) | |
| parent | 4345adf92db760ca1a54061ce284aaa2e7d0791e (diff) | |
| download | linux-0-day-c34c0d7684b8b79666da6b1bc37fc330cd0dd216.tar.gz linux-0-day-c34c0d7684b8b79666da6b1bc37fc330cd0dd216.tar.xz | |
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
Diffstat (limited to 'sound/pci/hda/hda_generic.h')
| -rw-r--r-- | sound/pci/hda/hda_generic.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_generic.h b/sound/pci/hda/hda_generic.h index e199a852388b4..48d44026705b0 100644 --- a/sound/pci/hda/hda_generic.h +++ b/sound/pci/hda/hda_generic.h @@ -220,6 +220,7 @@ struct hda_gen_spec { unsigned int hp_mic:1; /* Allow HP as a mic-in */ unsigned int suppress_hp_mic_detect:1; /* Don't detect HP/mic */ unsigned int no_primary_hp:1; /* Don't prefer HP pins to speaker pins */ + unsigned int no_multi_io:1; /* Don't try multi I/O config */ unsigned int multi_cap_vol:1; /* allow multiple capture xxx volumes */ unsigned int inv_dmic_split:1; /* inverted dmic w/a for conexant */ unsigned int own_eapd_ctl:1; /* set EAPD by own function */ |