From 3731fe46ae05f9e84bd916ae1047fa63f5e2c203 Mon Sep 17 00:00:00 2001 From: David Miller Date: Thu, 25 Oct 2007 01:17:16 -0700 Subject: [PATCH] --- yaml --- r: 73185 b: refs/heads/master c: 5257dca0bdc36027a4bfc1002264bd465e86ab7a h: refs/heads/master i: 73183: c5d534e1c82869f10f1f82821b7870c5d5e0ff56 v: v3 --- [refs] | 2 +- trunk/drivers/pci/quirks.c | 3 --- trunk/include/linux/pci_ids.h | 3 --- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 7297bf4f8a4e..139d824d2ada 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc38b411fe696fad32b261f492cb4afbf1835256 +refs/heads/master: 5257dca0bdc36027a4bfc1002264bd465e86ab7a diff --git a/trunk/drivers/pci/quirks.c b/trunk/drivers/pci/quirks.c index d8f2d890f641..26cc4dcf4f0e 100644 --- a/trunk/drivers/pci/quirks.c +++ b/trunk/drivers/pci/quirks.c @@ -1623,9 +1623,6 @@ static void __init quirk_disable_all_msi(struct pci_dev *dev) DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_GCNB_LE, quirk_disable_all_msi); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS400_200, quirk_disable_all_msi); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS480, quirk_disable_all_msi); -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RD580, quirk_disable_all_msi); -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RX790, quirk_disable_all_msi); -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS690, quirk_disable_all_msi); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VT3351, quirk_disable_all_msi); /* Disable MSI on chipsets that are known to not support it */ diff --git a/trunk/include/linux/pci_ids.h b/trunk/include/linux/pci_ids.h index 7a347dcad06e..fbe19648bf91 100644 --- a/trunk/include/linux/pci_ids.h +++ b/trunk/include/linux/pci_ids.h @@ -360,9 +360,6 @@ #define PCI_DEVICE_ID_ATI_RS400_166 0x5a32 #define PCI_DEVICE_ID_ATI_RS400_200 0x5a33 #define PCI_DEVICE_ID_ATI_RS480 0x5950 -#define PCI_DEVICE_ID_ATI_RD580 0x5952 -#define PCI_DEVICE_ID_ATI_RX790 0x5957 -#define PCI_DEVICE_ID_ATI_RS690 0x7910 /* ATI IXP Chipset */ #define PCI_DEVICE_ID_ATI_IXP200_IDE 0x4349 #define PCI_DEVICE_ID_ATI_IXP200_SMBUS 0x4353