diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-09-09 14:50:17 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-09-09 16:46:01 +0200 |
| commit | 86e2959a10828dd2614e037fb2502bc833adca52 (patch) | |
| tree | 4d5d2a60d23958d49ac8aebcb985b71d27305b01 /sound/pci/hda/hda_local.h | |
| parent | b5786e85cb2ffd0b07e86dec38a442bd20765ad8 (diff) | |
| download | linux-86e2959a10828dd2614e037fb2502bc833adca52.tar.gz linux-86e2959a10828dd2614e037fb2502bc833adca52.tar.bz2 linux-86e2959a10828dd2614e037fb2502bc833adca52.zip | |
ALSA: hda - Remove AUTO_PIN_FRONT_{MIC|LINE}
We can assign multiple pins to a single role now, let's reduce the
redundant FRONT_MIC and FRONT_LINE. Also, autocfg->input_pins[] is
no longer used, so this is removed as well.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_local.h')
| -rw-r--r-- | sound/pci/hda/hda_local.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h index b448b0a997b1..72e7b2f210ee 100644 --- a/sound/pci/hda/hda_local.h +++ b/sound/pci/hda/hda_local.h @@ -366,9 +366,7 @@ struct hda_bus_unsolicited { enum { AUTO_PIN_MIC, - AUTO_PIN_FRONT_MIC, - AUTO_PIN_LINE, - AUTO_PIN_FRONT_LINE, + AUTO_PIN_LINE_IN, AUTO_PIN_CD, AUTO_PIN_AUX, AUTO_PIN_LAST @@ -403,7 +401,6 @@ struct auto_pin_cfg { int hp_outs; int line_out_type; /* AUTO_PIN_XXX_OUT */ hda_nid_t hp_pins[AUTO_CFG_MAX_OUTS]; - hda_nid_t input_pins[AUTO_PIN_LAST]; /* old config; to be deprecated */ int num_inputs; struct auto_pin_cfg_item inputs[AUTO_CFG_MAX_INS]; int dig_outs; |