diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-08-10 11:58:09 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-08-10 11:58:09 +0200 |
commit | d5c9c8912a25550f2b6a0974667eb968fe6a316e (patch) | |
tree | 019ba3e984e646574c80c28eba05681e6091f308 /sound/pci | |
parent | da2a2aaa8e3dddb41678af7e5295d9e3e6c030a4 (diff) | |
parent | 100d5eb36ba20dc0b99a17ea2b9800c567bfc3d1 (diff) | |
download | kernel_samsung_aries-d5c9c8912a25550f2b6a0974667eb968fe6a316e.zip kernel_samsung_aries-d5c9c8912a25550f2b6a0974667eb968fe6a316e.tar.gz kernel_samsung_aries-d5c9c8912a25550f2b6a0974667eb968fe6a316e.tar.bz2 |
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 8e9b6e9..b0d30fc 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) set_capture_mixer(spec); set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT); + spec->vmaster_nid = 0x02; + codec->patch_ops = alc_patch_ops; if (board_config == ALC269_AUTO) spec->init_hook = alc269_auto_init; |