OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
305355a
)
ALSA: hda - Fix the merge error
author
Takashi Iwai
<tiwai@suse.de>
Fri, 10 Jul 2009 10:33:48 +0000
(12:33 +0200)
committer
Takashi Iwai
<tiwai@suse.de>
Fri, 10 Jul 2009 10:33:48 +0000
(12:33 +0200)
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>
sound/pci/hda/patch_realtek.c
patch
|
blob
|
history
diff --git
a/sound/pci/hda/patch_realtek.c
b/sound/pci/hda/patch_realtek.c
index
88a9da4
..
7967f8f
100644
(file)
--- 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},
+ alc88
0_gpio3_init_verbs, alc88
2_targa_verbs},
.num_dacs = ARRAY_SIZE(alc882_dac_nids),
.dac_nids = alc882_dac_nids,
.dig_out_nid = ALC882_DIGOUT_NID,