From 5fadc4ae57fa8e5d1ae5b9dcb91ec8eb2e2f919d Mon Sep 17 00:00:00 2001
From: Suresh Siddha <suresh.b.siddha@intel.com>
Date: Tue, 23 Aug 2011 17:05:21 -0700
Subject: [PATCH] --- yaml --- r: 268903 b: refs/heads/master c:
 80990c5ba6de9040d2df7c06e3c222c61004085d h: refs/heads/master i:   268901:
 f81e477e92da0b07d5bb7310d37d342243bd524a   268899:
 dc0045e31954e5224de7fb107ebb8cbc6e133086   268895:
 aee26091d950ecebaa3b5ed3af102ce6710a0010 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/iommu/dmar.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

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;
 }