Merge branch 'x86/urgent' into x86/core

[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 30bbde0cb34bfba7e272ad68be2dffad8ef20d0d..60258319299183fa10ba7127f8af81a4e45f4f4e 100644 (file)
--- a/include/asm-x86/pci.h
+++ b/include/asm-x86/pci.h
@@ -1,5 +1,5 @@
-#ifndef __x86_PCI_H
-#define __x86_PCI_H
+#ifndef ASM_X86__PCI_H
+#define ASM_X86__PCI_H
 
 #include <linux/mm.h> /* for struct page */
 #include <linux/types.h>
@@ -18,6 +18,8 @@ struct pci_sysdata {
 #endif
 };
 
+extern int pci_routeirq;
+
 /* 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,
                                            int node);
@@ -109,4 +111,4 @@ static inline cpumask_t __pcibus_to_cpumask(struct pci_bus *bus)
 }
 #endif
 
-#endif
+#endif /* ASM_X86__PCI_H */