diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-11-18 16:38:49 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-11-18 16:38:49 +0100 |
commit | ef4b18e2af09b69b5a183ad611f5965ef1766be4 (patch) | |
tree | 0d02161d0fb8f65117d616d65a96b99dc4da8367 | |
parent | ALSA: usb - Quirk to disable master volume control in PCM2702 (diff) | |
parent | ALSA: hda - Fix quirk for VAIO type G (diff) | |
download | linux-ef4b18e2af09b69b5a183ad611f5965ef1766be4.tar.xz linux-ef4b18e2af09b69b5a183ad611f5965ef1766be4.zip |
Merge branch 'fix/hda' into for-linus
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 84a52efdb2d6..70583719282b 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -11462,6 +11462,7 @@ static struct snd_pci_quirk alc262_cfg_tbl[] = { SND_PCI_QUIRK(0x104d, 0x9016, "Sony VAIO", ALC262_AUTO), /* dig-only */ SND_PCI_QUIRK(0x104d, 0x9025, "Sony VAIO Z21MN", ALC262_TOSHIBA_S06), SND_PCI_QUIRK(0x104d, 0x9035, "Sony VAIO VGN-FW170J", ALC262_AUTO), + SND_PCI_QUIRK(0x104d, 0x9047, "Sony VAIO Type G", ALC262_AUTO), SND_PCI_QUIRK_MASK(0x104d, 0xff00, 0x9000, "Sony VAIO", ALC262_SONY_ASSAMD), SND_PCI_QUIRK(0x1179, 0x0001, "Toshiba dynabook SS RX1", |