Merge branches 'core/iommu', 'x86/amd-iommu' and 'x86/iommu' into x86-v28-for-linus...

[linux-2.6-block.git] / include / asm-x86 / iommu.h

diff --git a/include/asm-x86/iommu.h b/include/asm-x86/iommu.h
index e86f44148c66f043cfb3a9ba9dfc1419cc2b25da..546ad3110feaef59c2a607e98593d8e38f17b272 100644 (file)
--- a/include/asm-x86/iommu.h
+++ b/include/asm-x86/iommu.h
@@ -6,6 +6,7 @@ extern void no_iommu_init(void);
 extern struct dma_mapping_ops nommu_dma_ops;
 extern int force_iommu, no_iommu;
 extern int iommu_detected;
+extern int dmar_disabled;
 
 extern unsigned long iommu_num_pages(unsigned long addr, unsigned long len);