projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/home/rmk/linux-2.6-serial
[cascardo/linux.git]
/
include
/
asm-x86_64
/
pci.h
diff --git
a/include/asm-x86_64/pci.h
b/include/asm-x86_64/pci.h
index
fd03e15
..
8a05af2
100644
(file)
--- a/
include/asm-x86_64/pci.h
+++ b/
include/asm-x86_64/pci.h
@@
-19,8
+19,6
@@
extern unsigned int pcibios_assign_all_busses(void);
#endif
#define pcibios_scan_all_fns(a, b) 0
-extern int no_iommu, force_iommu;
-
extern unsigned long pci_mem_start;
#define PCIBIOS_MIN_IO 0x1000
#define PCIBIOS_MIN_MEM (pci_mem_start)