From 37ab9ca4fb7fd8cb21196b63d5a8c2a21b854625 Mon Sep 17 00:00:00 2001 From: David Miller Date: Thu, 25 Oct 2007 01:15:53 -0700 Subject: [PATCH] --- yaml --- r: 73182 b: refs/heads/master c: 1d84b5424efbcce69a1c955ba181147d23d43a14 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pci/quirks.c | 3 +++ trunk/include/linux/pci_ids.h | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b02fa9aa50bf..b50862bdb46a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2cc31879f8cfa0efc74fe7e58ab4e01ef5908730 +refs/heads/master: 1d84b5424efbcce69a1c955ba181147d23d43a14 diff --git a/trunk/drivers/pci/quirks.c b/trunk/drivers/pci/quirks.c index f5999f569cc8..f975f7fccb1d 100644 --- a/trunk/drivers/pci/quirks.c +++ b/trunk/drivers/pci/quirks.c @@ -1677,6 +1677,9 @@ static void __devinit quirk_msi_ht_cap(struct pci_dev *dev) } DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_HT2000_PCIE, quirk_msi_ht_cap); +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SERVERWORKS, + PCI_DEVICE_ID_SERVERWORKS_HT1000_PXB, + quirk_msi_ht_cap); /* The nVidia CK804 chipset may have 2 HT MSI mappings. * MSI are supported if the MSI capability set in any of these mappings. diff --git a/trunk/include/linux/pci_ids.h b/trunk/include/linux/pci_ids.h index ab6edec13f68..7a347dcad06e 100644 --- a/trunk/include/linux/pci_ids.h +++ b/trunk/include/linux/pci_ids.h @@ -1436,6 +1436,7 @@ #define PCI_DEVICE_ID_SERVERWORKS_HE 0x0008 #define PCI_DEVICE_ID_SERVERWORKS_LE 0x0009 #define PCI_DEVICE_ID_SERVERWORKS_GCNB_LE 0x0017 +#define PCI_DEVICE_ID_SERVERWORKS_HT1000_PXB 0x0036 #define PCI_DEVICE_ID_SERVERWORKS_EPB 0x0103 #define PCI_DEVICE_ID_SERVERWORKS_HT2000_PCIE 0x0132 #define PCI_DEVICE_ID_SERVERWORKS_OSB4 0x0200