---

yaml --- r: 138904 b: refs/heads/master c: fb44672 h: refs/heads/master v: v3
git-mirror · Jan 27, 2009 · 1c644af · 1c644af
1 parent 56fce3b
commit 1c644af
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b041cf22ddb742874040d0a3259d0be46f3d3a4b
+refs/heads/master: fb4467274de0c93e15c4a4fd3249d62454ba57dc
diff --git a/trunk/arch/ia64/kernel/dma-mapping.c b/trunk/arch/ia64/kernel/dma-mapping.c
@@ -1,5 +1,8 @@
 #include <linux/dma-mapping.h>
 
+/* 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);
 

diff --git a/trunk/arch/ia64/kernel/pci-swiotlb.c b/trunk/arch/ia64/kernel/pci-swiotlb.c
@@ -13,9 +13,6 @@
 int swiotlb __read_mostly;
 EXPORT_SYMBOL(swiotlb);
 
-/* Set this to 1 if there is a HW IOMMU in the system */
-int iommu_detected __read_mostly;
-
 struct dma_map_ops swiotlb_dma_ops = {
 	.alloc_coherent = swiotlb_alloc_coherent,
 	.free_coherent = swiotlb_free_coherent,