Fix up Alan's huge patch set. It couldn't have compiled for

him either. Tssk, tssk.

drivers/pci/quirks.c

@@ -350,8 +350,8 @@ static void __devinit quirk_amd_ioapic(struct pci_dev *dev)
 
 static void __init quirk_ioapic_rmw(struct pci_dev *dev)
 {
-	if(dev->devfn == 0 && dev->bus->number == 0)
-		apic_sys_bug = 1;
+	if (dev->devfn == 0 && dev->bus->number == 0)
+		sis_apic_bug = 1;
 }
 
 

include/asm-i386/io_apic.h

@@ -123,9 +123,10 @@ static inline void io_apic_write(unsigned int apic, unsigned int reg, unsigned i
  *
  * Older SiS APIC requires we rewrite the index regiser
  */
+extern int sis_apic_bug;
 static inline void io_apic_modify(unsigned int apic, unsigned int reg, unsigned int value)
 {
-	if(apic_sis_bug)
+	if (sis_apic_bug)
 		*IO_APIC_BASE(apic) = reg;
 	*(IO_APIC_BASE(apic)+4) = value;
 }

include/linux/pci_ids.h

@@ -485,6 +485,7 @@
 #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
@@ -1906,4 +1907,3 @@
 
 #define PCI_VENDOR_ID_HINT		0x3388
 #define PCI_DEVICE_ID_HINT_VXPROII_IDE	0x8013
-