[PATCH] clean up sis PCI quirk

816d5301 · Alan Cox · James Bottomley · 978ef321 · 816d5301 · 816d5301
Commit 816d5301 authored Dec 01, 2002 by Alan Cox Committed by James Bottomley Dec 01, 2002
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

drivers/pci/quirks.c drivers/pci/quirks.c +1 -1

include/linux/pci_ids.h include/linux/pci_ids.h +0 -1

No files found.
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -561,7 +561,7 @@ static struct pci_fixup pci_fixups[] __devinitdata = {
 #ifdef CONFIG_X86_IO_APIC 
 	{ PCI_FIXUP_FINAL,	PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_82C686,	quirk_via_ioapic },
 	{ PCI_FIXUP_FINAL, 	PCI_VENDOR_ID_AMD,	PCI_DEVICE_ID_AMD_VIPER_7410,	quirk_amd_ioapic },
-	{ PCI_FIXUP_FINAL,	PCI_VENDOR_ID_SIS,	PCI_ANY_ID,			quirk_ioapic_rmw },
+	{ PCI_FIXUP_FINAL,	PCI_VENDOR_ID_SI,	PCI_ANY_ID,			quirk_ioapic_rmw },
 #endif
 	{ PCI_FIXUP_HEADER,	PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_82C586_3,	quirk_via_acpi },
 	{ PCI_FIXUP_HEADER,	PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_82C686_4,	quirk_via_acpi },

--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -485,7 +485,6 @@
 #define PCI_VENDOR_ID_FD		0x1036
 #define PCI_DEVICE_ID_FD_36C70		0x0000

-#define PCI_VENDOR_ID_SIS		0x1039
 #define PCI_VENDOR_ID_SI		0x1039
 #define PCI_DEVICE_ID_SI_5591_AGP	0x0001
 #define PCI_DEVICE_ID_SI_6202		0x0002