Merge branch 'topic/ice' into for-linus

[pandora-kernel.git] / include / linux / dma_remapping.h

diff --git a/include/linux/dma_remapping.h b/include/linux/dma_remapping.h
index 7799a85..af1dab4 100644 (file)
--- a/include/linux/dma_remapping.h
+++ b/include/linux/dma_remapping.h
@@ -18,6 +18,15 @@ struct root_entry;
 
 extern void free_dmar_iommu(struct intel_iommu *iommu);
 
+#ifdef CONFIG_DMAR
+extern int iommu_calculate_agaw(struct intel_iommu *iommu);
+#else
+static inline int iommu_calculate_agaw(struct intel_iommu *iommu)
+{
+       return 0;
+}
+#endif
+
 extern int dmar_disabled;
 
 #endif