From 5328c0c9afee77b0de3a2e08b2df1f50a5402630 Mon Sep 17 00:00:00 2001 From: "John W. Linville" Date: Mon, 20 Mar 2006 14:33:56 -0500 Subject: [PATCH] --- yaml --- r: 25769 b: refs/heads/master c: 5da594b1c523dffa19ebe7630e1ca285f439bd03 h: refs/heads/master i: 25767: 264ddea382c2841f857e8f3848f544e1f6b025cc v: v3 --- [refs] | 2 +- trunk/drivers/pci/quirks.c | 2 +- trunk/include/linux/pci_ids.h | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 07b7a34d1a7b..459a215f4454 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 41017f0cac925e4a6bcf3359b75e5538112d4216 +refs/heads/master: 5da594b1c523dffa19ebe7630e1ca285f439bd03 diff --git a/trunk/drivers/pci/quirks.c b/trunk/drivers/pci/quirks.c index 4970f47be72c..2158feffe24a 100644 --- a/trunk/drivers/pci/quirks.c +++ b/trunk/drivers/pci/quirks.c @@ -592,7 +592,7 @@ static void __init quirk_amd_8131_ioapic(struct pci_dev *dev) pci_write_config_byte( dev, AMD8131_MISC, tmp); } } -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_APIC, quirk_amd_8131_ioapic ); +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_amd_8131_ioapic); static void __init quirk_svw_msi(struct pci_dev *dev) { diff --git a/trunk/include/linux/pci_ids.h b/trunk/include/linux/pci_ids.h index 870fe38378b1..8d03e10212f5 100644 --- a/trunk/include/linux/pci_ids.h +++ b/trunk/include/linux/pci_ids.h @@ -497,7 +497,8 @@ #define PCI_DEVICE_ID_AMD_8111_SMBUS 0x746b #define PCI_DEVICE_ID_AMD_8111_AUDIO 0x746d #define PCI_DEVICE_ID_AMD_8151_0 0x7454 -#define PCI_DEVICE_ID_AMD_8131_APIC 0x7450 +#define PCI_DEVICE_ID_AMD_8131_BRIDGE 0x7450 +#define PCI_DEVICE_ID_AMD_8131_APIC 0x7451 #define PCI_DEVICE_ID_AMD_CS5536_ISA 0x2090 #define PCI_DEVICE_ID_AMD_CS5536_FLASH 0x2091 #define PCI_DEVICE_ID_AMD_CS5536_AUDIO 0x2093