summaryrefslogtreecommitdiffstats
path: root/include/asm-x86_64/pci.h
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2006-03-20 11:58:02 -0600
committerKumar Gala <galak@kernel.crashing.org>2006-03-20 11:58:02 -0600
commit1a02e59a2970f9ed28ab51d3b08624b79e54d848 (patch)
tree470cce472be3b08c160e0c569648e7228651b12a /include/asm-x86_64/pci.h
parentebcff3c773b42bce6182ec16485abca4e53fba97 (diff)
parent2c276603c3e5ebf38155a9d1fbbda656d52d138e (diff)
downloadtalos-obmc-linux-1a02e59a2970f9ed28ab51d3b08624b79e54d848.tar.gz
talos-obmc-linux-1a02e59a2970f9ed28ab51d3b08624b79e54d848.zip
Merge branch 'master'
Diffstat (limited to 'include/asm-x86_64/pci.h')
-rw-r--r--include/asm-x86_64/pci.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-x86_64/pci.h b/include/asm-x86_64/pci.h
index fd03e15d7ea6..8a05af264d18 100644
--- 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)
OpenPOWER on IntegriCloud