diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-07-10 12:33:48 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-07-10 12:33:48 +0200 |
| commit | 31909b83ea5b4035ce129bb0df622ec2d2fb3e96 (patch) | |
| tree | 74d6bf2cc7a95dfb70d407dda6a84952d3e9b160 | |
| parent | 305355aad89f1b7eb27cb210fad2f9d3c67b2572 (diff) | |
| download | op-kernel-dev-31909b83ea5b4035ce129bb0df622ec2d2fb3e96.zip op-kernel-dev-31909b83ea5b4035ce129bb0df622ec2d2fb3e96.tar.gz | |
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 <tiwai@suse.de>
| -rw-r--r-- | sound/pci/hda/patch_realtek.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 88a9da4a..7967f8f 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, |
