From: Ben Hutchings <ben@decadent.org.uk>
Date: Wed, 24 Mar 2010 03:33:48 +0000 (+0000)
Subject: sis-agp: Remove SIS 760, handled by amd64-agp
X-Git-Tag: v2.6.35-rc1~451^2~11
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=d831692a1a8e9ceaaa9bb16bb3fc503b7e372558;p=net-next-2.6.git

sis-agp: Remove SIS 760, handled by amd64-agp

SIS 760 is listed in the device tables for both amd64-agp and sis-agp.
amd64-agp is apparently preferable since it has workarounds for some
BIOS misconfigurations that sis-agp doesn't handle.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/drivers/char/agp/sis-agp.c b/drivers/char/agp/sis-agp.c
index b53d5f4e9cb..29aacd81de7 100644
--- a/drivers/char/agp/sis-agp.c
+++ b/drivers/char/agp/sis-agp.c
@@ -416,14 +416,6 @@ static struct pci_device_id agp_sis_pci_table[] = {
 		.subvendor	= PCI_ANY_ID,
 		.subdevice	= PCI_ANY_ID,
 	},
-	{
-		.class		= (PCI_CLASS_BRIDGE_HOST << 8),
-		.class_mask	= ~0,
-		.vendor		= PCI_VENDOR_ID_SI,
-		.device		= PCI_DEVICE_ID_SI_760,
-		.subvendor	= PCI_ANY_ID,
-		.subdevice	= PCI_ANY_ID,
-	},
 	{ }
 };