Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block

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

diff --git a/include/asm-x86_64/pci.h b/include/asm-x86_64/pci.h
index fd03e15d7ea6f5edf50d5cfb72743c907aa8f2c1..8a05af264d1865d57e429ce69e696cc379b2dc95 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)