diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-22 03:06:21 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-22 03:06:21 -0400 |
| commit | 76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b (patch) | |
| tree | 3824e008db9d554229a70c85fbbc13238276bd7a /include/asm-mips/pci.h | |
| parent | 7be42004065ce4df193aeef5befd26805267d0d9 (diff) | |
| parent | 93ded9b8fd42abe2c3607097963d8de6ad9117eb (diff) | |
Merge branch 'linus' into x86/x2apic
Diffstat (limited to 'include/asm-mips/pci.h')
| -rw-r--r-- | include/asm-mips/pci.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-mips/pci.h b/include/asm-mips/pci.h index d3be83436070..c205875d7f31 100644 --- a/include/asm-mips/pci.h +++ b/include/asm-mips/pci.h | |||
| @@ -173,6 +173,5 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) | |||
| 173 | } | 173 | } |
| 174 | 174 | ||
| 175 | extern int pci_probe_only; | 175 | extern int pci_probe_only; |
| 176 | extern unsigned int pcibios_max_latency; | ||
| 177 | 176 | ||
| 178 | #endif /* _ASM_PCI_H */ | 177 | #endif /* _ASM_PCI_H */ |