From 8986482c416d8b8a872076114e624f27aae2395c Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc@redhat.com>
Date: Thu, 20 Nov 2008 15:49:49 +0000
Subject: [PATCH] --- yaml --- r: 125563 b: refs/heads/master c:
 58fa7304a2c2bfd46e505c293ef779aa1d9715c2 h: refs/heads/master i:   125561:
 36506463a0e38fd82264653a6aae3e8e2be4f630   125559:
 fe5a723f7fd3efadd303516e9a426ced26bd8acc v: v3

---
 [refs]                     | 2 +-
 trunk/include/linux/dmar.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f8d06f6ed61f..9d9cf6c21336 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a647dacbb1389aa6a5fa631766c1eaea35905890
+refs/heads/master: 58fa7304a2c2bfd46e505c293ef779aa1d9715c2
diff --git a/trunk/include/linux/dmar.h b/trunk/include/linux/dmar.h
index f1984fc3e06d..f28440784cf0 100644
--- a/trunk/include/linux/dmar.h
+++ b/trunk/include/linux/dmar.h
@@ -144,7 +144,6 @@ struct dmar_rmrr_unit {
 	list_for_each_entry(rmrr, &dmar_rmrr_units, list)
 /* Intel DMAR  initialization functions */
 extern int intel_iommu_init(void);
-extern int dmar_disabled;
 #else
 static inline int intel_iommu_init(void)
 {