---

yaml --- r: 153862 b: refs/heads/master c: 008fe14 h: refs/heads/master v: v3
git-mirror · Jun 5, 2009 · 255b710 · 255b710
1 parent b46fc49
commit 255b710
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93a23a7271dfb811b3adb72779054c3a24433112
+refs/heads/master: 008fe148cb0fb51d266baabe2c09997b21cf90c6
diff --git a/trunk/arch/ia64/include/asm/iommu.h b/trunk/arch/ia64/include/asm/iommu.h
@@ -9,7 +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);