Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

[linux-2.6-omap-h63xx.git] / arch / ia64 / kernel / dma-mapping.c

diff --git a/arch/ia64/kernel/dma-mapping.c b/arch/ia64/kernel/dma-mapping.c
index 876665ae9fff0ef97d11ea6bb04dc63ac2e7743a..086a2aeb0404e6a889d6b10cfe766eca20a568c3 100644 (file)
--- a/arch/ia64/kernel/dma-mapping.c
+++ b/arch/ia64/kernel/dma-mapping.c
@@ -1,4 +1,13 @@
 #include <linux/dma-mapping.h>
 
-struct dma_mapping_ops *dma_ops;
+/* Set this to 1 if there is a HW IOMMU in the system */
+int iommu_detected __read_mostly;
+
+struct dma_map_ops *dma_ops;
 EXPORT_SYMBOL(dma_ops);
+
+struct dma_map_ops *dma_get_ops(struct device *dev)
+{
+       return dma_ops;
+}
+EXPORT_SYMBOL(dma_get_ops);