diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-08-10 05:58:09 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-08-10 05:58:09 -0400 |
| commit | d5c9c8912a25550f2b6a0974667eb968fe6a316e (patch) | |
| tree | 019ba3e984e646574c80c28eba05681e6091f308 /sound/pci | |
| parent | da2a2aaa8e3dddb41678af7e5295d9e3e6c030a4 (diff) | |
| parent | 100d5eb36ba20dc0b99a17ea2b9800c567bfc3d1 (diff) | |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/hda/patch_realtek.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 8e9b6e9f193a..b0d30fced3f5 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
| @@ -13372,6 +13372,8 @@ static int patch_alc269(struct hda_codec *codec) | |||
| 13372 | set_capture_mixer(spec); | 13372 | set_capture_mixer(spec); |
| 13373 | set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT); | 13373 | set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT); |
| 13374 | 13374 | ||
| 13375 | spec->vmaster_nid = 0x02; | ||
| 13376 | |||
| 13375 | codec->patch_ops = alc_patch_ops; | 13377 | codec->patch_ops = alc_patch_ops; |
| 13376 | if (board_config == ALC269_AUTO) | 13378 | if (board_config == ALC269_AUTO) |
| 13377 | spec->init_hook = alc269_auto_init; | 13379 | spec->init_hook = alc269_auto_init; |