---

yaml --- r: 154790 b: refs/heads/master c: 3238c0c h: refs/heads/master v: v3
git-mirror · Jul 1, 2009 · ab8f021 · ab8f021
1 parent d0fe3f7
commit ab8f021
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3a0a52fff4dbfdea2dccc908d00c038481d888e
+refs/heads/master: 3238c0c4d68d9a9022b411a11a4b933fbdb53a14
diff --git a/trunk/arch/x86/kernel/pci-dma.c b/trunk/arch/x86/kernel/pci-dma.c
@@ -211,11 +211,11 @@ static __init int iommu_setup(char *p)
 #ifdef CONFIG_SWIOTLB
 		if (!strncmp(p, "soft", 4))
 			swiotlb = 1;
+#endif
 		if (!strncmp(p, "pt", 2)) {
 			iommu_pass_through = 1;
 			return 1;
 		}
-#endif
 
 		gart_parse_options(p);