aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_local.h
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/hda/hda_local.h')
-rw-r--r--sound/pci/hda/hda_local.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index 548a8b698487..14e8aa2806ed 100644
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -135,6 +135,7 @@ struct hda_multi_out {
135 int num_dacs; /* # of DACs, must be more than 1 */ 135 int num_dacs; /* # of DACs, must be more than 1 */
136 hda_nid_t *dac_nids; /* DAC list */ 136 hda_nid_t *dac_nids; /* DAC list */
137 hda_nid_t hp_nid; /* optional DAC for HP, 0 when not exists */ 137 hda_nid_t hp_nid; /* optional DAC for HP, 0 when not exists */
138 hda_nid_t extra_out_nid[3]; /* optional DACs, 0 when not exists */
138 hda_nid_t dig_out_nid; /* digital out audio widget */ 139 hda_nid_t dig_out_nid; /* digital out audio widget */
139 int max_channels; /* currently supported analog channels */ 140 int max_channels; /* currently supported analog channels */
140 int dig_out_used; /* current usage of digital out (HDA_DIG_XXX) */ 141 int dig_out_used; /* current usage of digital out (HDA_DIG_XXX) */
@@ -221,7 +222,8 @@ extern const char *auto_pin_cfg_labels[AUTO_PIN_LAST];
221struct auto_pin_cfg { 222struct auto_pin_cfg {
222 int line_outs; 223 int line_outs;
223 hda_nid_t line_out_pins[5]; /* sorted in the order of Front/Surr/CLFE/Side */ 224 hda_nid_t line_out_pins[5]; /* sorted in the order of Front/Surr/CLFE/Side */
224 hda_nid_t speaker_pin; 225 int speaker_outs;
226 hda_nid_t speaker_pins[5];
225 hda_nid_t hp_pin; 227 hda_nid_t hp_pin;
226 hda_nid_t input_pins[AUTO_PIN_LAST]; 228 hda_nid_t input_pins[AUTO_PIN_LAST];
227 hda_nid_t dig_out_pin; 229 hda_nid_t dig_out_pin;