Skip to content

Commit

Permalink
ALSA: hda - Fix the merge error
Browse files Browse the repository at this point in the history
Fix the merge error at the commit 305355a,
an addition of the missing alc880_gpio3_init_verbs to ALC882_TARGA model.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Takashi Iwai committed Jul 10, 2009
1 parent 305355a commit 31909b8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sound/pci/hda/patch_realtek.c
Original file line number Diff line number Diff line change
Expand Up @@ -8587,7 +8587,7 @@ static struct alc_config_preset alc882_presets[] = {
[ALC882_TARGA] = {
.mixers = { alc882_targa_mixer, alc882_chmode_mixer },
.init_verbs = { alc882_base_init_verbs, alc882_adc1_init_verbs,
alc882_targa_verbs},
alc880_gpio3_init_verbs, alc882_targa_verbs},
.num_dacs = ARRAY_SIZE(alc882_dac_nids),
.dac_nids = alc882_dac_nids,
.dig_out_nid = ALC882_DIGOUT_NID,
Expand Down

0 comments on commit 31909b8

Please sign in to comment.