Merge tag 'please-pull-next' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl...
[muen/linux.git] / drivers / iommu / intel-iommu.c
index bedc801b06a0bf2c6745511acbab08e769a54eb2..76f0a5d16ed3ba816490fc49a1296d9d83ed39b9 100644 (file)
@@ -3895,7 +3895,7 @@ static int intel_mapping_error(struct device *dev, dma_addr_t dma_addr)
        return !dma_addr;
 }
 
-const struct dma_map_ops intel_dma_ops = {
+static const struct dma_map_ops intel_dma_ops = {
        .alloc = intel_alloc_coherent,
        .free = intel_free_coherent,
        .map_sg = intel_map_sg,
@@ -3903,9 +3903,7 @@ const struct dma_map_ops intel_dma_ops = {
        .map_page = intel_map_page,
        .unmap_page = intel_unmap_page,
        .mapping_error = intel_mapping_error,
-#ifdef CONFIG_X86
        .dma_supported = dma_direct_supported,
-#endif
 };
 
 static inline int iommu_domain_cache_init(void)