diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-09-11 16:46:36 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-09-11 16:46:36 +0200 |
commit | 05288426908ecb7ed7cbff61901db5918525578a (patch) | |
tree | 94a814cfdd53a011a10da09201ed08a6572175ff /sound/pci/hda/hda_intel.c | |
parent | b35aabd78ddae8300fda7e6a1ac6f0484ef3e804 (diff) | |
parent | c302d6133c094bda7a7ce94eac5b50c018a7ca7b (diff) | |
download | op-kernel-dev-05288426908ecb7ed7cbff61901db5918525578a.zip op-kernel-dev-05288426908ecb7ed7cbff61901db5918525578a.tar.gz |
Merge branch 'for-linus' into for-next
To merge HD-audio fixes back to 3.7 development line
Diffstat (limited to 'sound/pci/hda/hda_intel.c')
-rw-r--r-- | sound/pci/hda/hda_intel.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 76ec242..e1a12c7 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2796,6 +2796,7 @@ static struct snd_pci_quirk position_fix_list[] __devinitdata = { SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", POS_FIX_LPIB), SND_PCI_QUIRK(0x1043, 0x81b3, "ASUS", POS_FIX_LPIB), SND_PCI_QUIRK(0x1043, 0x81e7, "ASUS M2V", POS_FIX_LPIB), + SND_PCI_QUIRK(0x1043, 0x1b43, "ASUS K53E", POS_FIX_POSBUF), SND_PCI_QUIRK(0x104d, 0x9069, "Sony VPCS11V9E", POS_FIX_LPIB), SND_PCI_QUIRK(0x10de, 0xcb89, "Macbook Pro 7,1", POS_FIX_LPIB), SND_PCI_QUIRK(0x1297, 0x3166, "Shuttle", POS_FIX_LPIB), |