diff --git a/[refs] b/[refs] index 05a0fac8d795..85e6bb1d86f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 78d5f0f500e6ba8f6cfd0673475ff4d941d705a2 +refs/heads/master: 5715f0f9d3814e83e5f2f754d3f7abdfa096a0b9 diff --git a/trunk/drivers/pci/dmar.c b/trunk/drivers/pci/dmar.c index ffe22bc3ac8e..a04bde9bd10f 100644 --- a/trunk/drivers/pci/dmar.c +++ b/trunk/drivers/pci/dmar.c @@ -130,9 +130,10 @@ static 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 + else if (scope->entry_type != ACPI_DMAR_SCOPE_TYPE_IOAPIC) { printk(KERN_WARNING PREFIX - "Unsupported device scope\n"); + "Unsupported device scope\n"); + } start += scope->length; } if (*cnt == 0)