From aed7d49e582ddcf3c9a3d242b8c403a296e4134f Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Thu, 19 Nov 2009 02:18:44 +0000
Subject: [PATCH] --- yaml --- r: 168795 b: refs/heads/master c:
 5854d9c8d18359b1fc2f23c0ef2d51dd53281bd6 h: refs/heads/master i:   168793:
 49d6f0856d2bf890ec99bde9b30404aa6707555b   168791:
 ccb39069afdf5c1620b8d503f515f269a637d054 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/pci/dmar.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c84bbcecaa59..9a3ad2319b90 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66b00a7c93ec782d118d2c03bd599cfd041e80a1
+refs/heads/master: 5854d9c8d18359b1fc2f23c0ef2d51dd53281bd6
diff --git a/trunk/drivers/pci/dmar.c b/trunk/drivers/pci/dmar.c
index e5f8fc164fd3..b952ebc7a78b 100644
--- a/trunk/drivers/pci/dmar.c
+++ b/trunk/drivers/pci/dmar.c
@@ -609,6 +609,9 @@ int __init check_zero_address(void)
 				     dmi_get_system_info(DMI_BIOS_VENDOR),
 				     dmi_get_system_info(DMI_BIOS_VERSION),
 				     dmi_get_system_info(DMI_PRODUCT_VERSION));
+#ifdef CONFIG_DMAR
+				dmar_disabled = 1;
+#endif
 				return 0;
 			}
 			break;