Prev: [052/139] x86-32, resume: do a global tlb flush in S4 resume
Next: [069/139] drm/radeon/kms: fix tv dac conflict resolver
From: Greg KH on 22 Apr 2010 16:30 2.6.33-stable review patch. If anyone has any objections, please let us know. ------------------ From: Michele Ballabio <barra_cuda(a)katamail.com> commit 4193d13b2c2b694aa59e629e6daf6269d7922f13 upstream. This avoids a lockup at boot. Signed-off-by: Michele Ballabio <barra_cuda(a)katamail.com> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> --- sound/pci/hda/hda_intel.c | 1 + 1 file changed, 1 insertion(+) --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2357,6 +2357,7 @@ static struct snd_pci_quirk msi_black_li SND_PCI_QUIRK(0x1043, 0x81f2, "ASUS", 0), /* Athlon64 X2 + nvidia */ SND_PCI_QUIRK(0x1043, 0x81f6, "ASUS", 0), /* nvidia */ SND_PCI_QUIRK(0x1043, 0x822d, "ASUS", 0), /* Athlon64 X2 + nvidia MCP55 */ + SND_PCI_QUIRK(0x1849, 0x0888, "ASRock", 0), /* Athlon64 X2 + nvidia */ {} }; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |