diff --git a/[refs] b/[refs]
index bf9395c7c78e..f1043cf9170f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2797982ed93c10d5585ee1842ab298cb11326ff5
+refs/heads/master: 8a493d37f049b631e19584d1cb84cec88cbcf8fc
diff --git a/trunk/include/asm-x86/dma-mapping.h b/trunk/include/asm-x86/dma-mapping.h
index 56075320b813..f43420b8c573 100644
--- a/trunk/include/asm-x86/dma-mapping.h
+++ b/trunk/include/asm-x86/dma-mapping.h
@@ -15,7 +15,6 @@ extern dma_addr_t bad_dma_address;
 extern int iommu_merge;
 extern struct device x86_dma_fallback_dev;
 extern int panic_on_overflow;
-extern int force_iommu;
 
 struct dma_mapping_ops {
 	int             (*mapping_error)(struct device *dev,