From bb163c2912b7139cfe17d43c2694221eef0a734e 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: 373556 b: refs/heads/master c:
 ae3e7f3aba4441eca7a1ff5cb3e089824318ba79 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 b26625f6e2e7..4c0eb14ed4df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a93c841c2b3b14824f7728dd74bd00a1cedb806
+refs/heads/master: ae3e7f3aba4441eca7a1ff5cb3e089824318ba79
diff --git a/trunk/drivers/iommu/dmar.c b/trunk/drivers/iommu/dmar.c
index f7890edb22f5..a7967ceb79e6 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;