diff options
| author | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-11-25 03:10:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-11-25 03:10:06 -0800 |
| commit | f81179746d7249e10148ecd0ace4e1b9f1e49550 (patch) | |
| tree | 12e60c32bd012755638561eb196c70465f1156de | |
| parent | 4730678b7380740cca955025945de804e7f0427c (diff) | |
Fix up Alan's huge patch set. It couldn't have compiled for
him either. Tssk, tssk.
| -rw-r--r-- | drivers/pci/quirks.c | 4 | ||||
| -rw-r--r-- | include/asm-i386/io_apic.h | 3 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index eddce9f131f1..c03c9eb68d03 100644 --- 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 642e47f3c929..500053c36f82 100644 --- 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 1c285a504c75..584b9f55b7e3 100644 --- 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 - |