Merge branch 'timers/urgent' of ssh://master.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6] / include / asm-mips / pci.h

diff --git a/include/asm-mips/pci.h b/include/asm-mips/pci.h
index 301ff2f28012a0a8d693984cdeb682ca583445f8..d3be83436070cafbf824222054d9f717a3eaf414 100644 (file)
--- a/include/asm-mips/pci.h
+++ b/include/asm-mips/pci.h
@@ -172,4 +172,7 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
        return channel ? 15 : 14;
 }
 
+extern int pci_probe_only;
+extern unsigned int pcibios_max_latency;
+
 #endif /* _ASM_PCI_H */