diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-03-07 18:32:59 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-03-07 18:32:59 +0100 |
| commit | f811c3cf8fae63ecc8a937ba7376490e2565f8f1 (patch) | |
| tree | 2e1b91e0079b8f1b404260d2ea5cf51d513f6332 /sound/pci/hda/hda_generic.h | |
| parent | 3f550e323242bea82d07dfd06e6ce3f723eef7bd (diff) | |
| download | talos-obmc-linux-f811c3cf8fae63ecc8a937ba7376490e2565f8f1.tar.gz talos-obmc-linux-f811c3cf8fae63ecc8a937ba7376490e2565f8f1.zip | |
ALSA: hda - Consolidate add_in_jack_modes and add_out_jack_modes hints
There is no big merit to distinguish these two hints. Instead, just
have a single flag, add_jack_modes, for creating the jack mode enum
ctls for both I/O directions.
The hint string parser code is left and translated as add_jack_modes
just for keeping compatibility.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_generic.h')
| -rw-r--r-- | sound/pci/hda/hda_generic.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_generic.h b/sound/pci/hda/hda_generic.h index 7ee5b57946c9..984bf301ebbb 100644 --- a/sound/pci/hda/hda_generic.h +++ b/sound/pci/hda/hda_generic.h @@ -213,8 +213,7 @@ struct hda_gen_spec { unsigned int indep_hp:1; /* independent HP supported */ unsigned int prefer_hp_amp:1; /* enable HP amp for speaker if any */ unsigned int add_stereo_mix_input:1; /* add aamix as a capture src */ - unsigned int add_out_jack_modes:1; /* add output jack mode enum ctls */ - unsigned int add_in_jack_modes:1; /* add input jack mode enum ctls */ + unsigned int add_jack_modes:1; /* add i/o jack mode enum ctls */ unsigned int power_down_unused:1; /* power down unused widgets */ /* other internal flags */ |
