Merge git://git.infradead.org/battery-2.6

[sfrench/cifs-2.6.git] / arch / ia64 / include / asm / iommu.h

diff --git a/arch/ia64/include/asm/iommu.h b/arch/ia64/include/asm/iommu.h
index 0490794fe4aa3a61890443a52e05c29bb18670e2..745e095fe82eb0a6af73bbf744619e0b90865a3f 100644 (file)
--- a/arch/ia64/include/asm/iommu.h
+++ b/arch/ia64/include/asm/iommu.h
@@ -9,6 +9,11 @@ extern void pci_iommu_shutdown(void);
 extern void no_iommu_init(void);
 extern int force_iommu, no_iommu;
 extern int iommu_detected;
+#ifdef CONFIG_DMAR
+extern int iommu_pass_through;
+#else
+#define iommu_pass_through     (0)
+#endif
 extern void iommu_dma_init(void);
 extern void machvec_init(const char *name);