Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks

[linux-2.6-omap-h63xx.git] / include / asm-x86 / pci.h

diff --git a/include/asm-x86/pci.h b/include/asm-x86/pci.h
index 2db14cf17db8f9faeae76133445f144023d58ff6..52a29f7668efd5228e397fed91d0d48a40776bb2 100644 (file)
--- a/include/asm-x86/pci.h
+++ b/include/asm-x86/pci.h
@@ -19,6 +19,8 @@ struct pci_sysdata {
 };
 
 extern int pci_routeirq;
+extern int noioapicquirk;
+extern int ioapicreroute;
 
 /* scan a bus after allocating a pci_sysdata for it */
 extern struct pci_bus *pci_scan_bus_on_node(int busno, struct pci_ops *ops,