From ab8f021e973c62c28b70deb4d2aacc968c481713 Mon Sep 17 00:00:00 2001
From: David Woodhouse <David.Woodhouse@intel.com>
Date: Wed, 1 Jul 2009 18:56:16 +0100
Subject: [PATCH] --- yaml --- r: 154790 b: refs/heads/master c:
 3238c0c4d68d9a9022b411a11a4b933fbdb53a14 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/kernel/pci-dma.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0e8c7d2a44e1..0d788dd00d26 100644
--- 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
index 47630479b067..1a041bcf506b 100644
--- 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);