From: Takashi Iwai Date: Fri, 10 Jul 2009 10:33:48 +0000 (+0200) Subject: ALSA: hda - Fix the merge error X-Git-Tag: v2.6.32-rc1~732^2~13^2~78 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=31909b83ea5b4035ce129bb0df622ec2d2fb3e96;p=karo-tx-linux.git ALSA: hda - Fix the merge error Fix the merge error at the commit 305355aad89f1b7eb27cb210fad2f9d3c67b2572, an addition of the missing alc880_gpio3_init_verbs to ALC882_TARGA model. Signed-off-by: Takashi Iwai --- diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 88a9da4afe5c..7967f8f1a347 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -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,