Prev: [002/145] ARM: 5944/1: scsi: fix timer setup in fas216.c
Next: [103/145] netfilter: xt_recent: fix buffer overflow
From: Greg KH on 12 Mar 2010 19:40
2.6.32-stable review patch. If anyone has any objections, please let me know.

----------------
From: Ben Hutchings <ben(a)decadent.org.uk>

commit 275143e9b237dd7e0b6d01660fd9b8acd9922fa7 upstream.

Intergraph bought 3D Labs and some XVR-500 chips have Intergraph's
vendor id.

Reported-by: Jurij Smakov <jurij(a)wooyd.org>
Signed-off-by: Ben Hutchings <ben(a)decadent.org.uk>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>

---
drivers/video/sunxvr500.c | 1 +
1 file changed, 1 insertion(+)

--- a/drivers/video/sunxvr500.c
+++ b/drivers/video/sunxvr500.c
@@ -400,6 +400,7 @@ static void __devexit e3d_pci_unregister

static struct pci_device_id e3d_pci_table[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x7a0), },
+ { PCI_DEVICE(0x1091, 0x7a0), },
{ PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x7a2), },
{ .vendor = PCI_VENDOR_ID_3DLABS,
.device = PCI_ANY_ID,


--
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/
 | 
Pages: 1
Prev: [002/145] ARM: 5944/1: scsi: fix timer setup in fas216.c
Next: [103/145] netfilter: xt_recent: fix buffer overflow