diff --git a/[refs] b/[refs]
index 90c62eed8912..8041bc661ee9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 318fe7df9d8456f778451b01913b5d0dc0a25854
+refs/heads/master: 80990c5ba6de9040d2df7c06e3c222c61004085d
diff --git a/trunk/drivers/iommu/dmar.c b/trunk/drivers/iommu/dmar.c
index a10ccf2432c8..6f0422dcd0f5 100644
--- a/trunk/drivers/iommu/dmar.c
+++ b/trunk/drivers/iommu/dmar.c
@@ -540,9 +540,6 @@ int __init check_zero_address(void)
 	return 1;
 
 failed:
-#ifdef CONFIG_DMAR
-	dmar_disabled = 1;
-#endif
 	return 0;
 }