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

him either. Tssk, tssk.

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index eddce9f131f150403575851282a646f971fe3f97..c03c9eb68d03c295a38af5f5ba7911f7a47985b8 100644 (file)
--- a/drivers/pci/quirks.c
+++ b/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;
 }
 
 

diff --git a/include/asm-i386/io_apic.h b/include/asm-i386/io_apic.h
index 642e47f3c929b38fb56906e0a7556672730b98a8..500053c36f82cb72c41506a16cb42edb98b2e2d1 100644 (file)
--- a/include/asm-i386/io_apic.h
+++ b/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;
 }

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 1c285a504c7549c747faec96a78a88a1041a6c6f..584b9f55b7e3843fe2b9cd436290df29de1460e5 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/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
-