From 184808abde8bb1867f48e20527f27c8cf0304ba4 Mon Sep 17 00:00:00 2001
From: Linn Crosetto <linn@hp.com>
Date: Tue, 23 Apr 2013 12:26:45 -0600
Subject: [PATCH] --- yaml --- r: 366248 b: refs/heads/master c:
 13f72756da86f155898e2c2022f7b3a106c3742e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 33e9db7412a0..b0a0cb74b103 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26bfc540f6f2dcbd93d0b9ed8f37830419ded7e8
+refs/heads/master: 13f72756da86f155898e2c2022f7b3a106c3742e
diff --git a/trunk/drivers/iommu/dmar.c b/trunk/drivers/iommu/dmar.c
index e5cdaf87822c..b8008f679bc7 100644
--- a/trunk/drivers/iommu/dmar.c
+++ b/trunk/drivers/iommu/dmar.c
@@ -129,7 +129,8 @@ int __init dmar_parse_dev_scope(void *start, void *end, int *cnt,
 		if (scope->entry_type == ACPI_DMAR_SCOPE_TYPE_ENDPOINT ||
 		    scope->entry_type == ACPI_DMAR_SCOPE_TYPE_BRIDGE)
 			(*cnt)++;
-		else if (scope->entry_type != ACPI_DMAR_SCOPE_TYPE_IOAPIC) {
+		else if (scope->entry_type != ACPI_DMAR_SCOPE_TYPE_IOAPIC &&
+			scope->entry_type != ACPI_DMAR_SCOPE_TYPE_HPET) {
 			pr_warn("Unsupported device scope\n");
 		}
 		start += scope->length;