projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[linux-2.6-block.git]
/
arch
/
x86
/
include
/
asm
/
pci.h
diff --git
a/arch/x86/include/asm/pci.h
b/arch/x86/include/asm/pci.h
index 52d80d3d94f3d2c97c91891483218ecd090bd782..f8959c7a985f4f6f8ce581f1967ad95100fd1b64 100644
(file)
--- a/
arch/x86/include/asm/pci.h
+++ b/
arch/x86/include/asm/pci.h
@@
-19,6
+19,8
@@
struct pci_sysdata {
};
extern int pci_routeirq;
+extern int noioapicquirk;
+extern int noioapicreroute;
/* 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,