diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-11 15:26:51 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-11 15:26:51 +1100 |
commit | 0f59d0f5987ac72f74bf0ee5a6a1c042cc2c112a (patch) | |
tree | 2cd2ae959b5067521f66cadaaba2f9eb16e99ff3 | |
parent | 5e928d90818f63fe945e60bc8ec1bf09991730cb (diff) | |
parent | 0b8973a81876d90f916507ac40d1381068dc986a (diff) |
Merge remote branch 'dwmw2-iommu/master'
-rw-r--r-- | drivers/pci/dmar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c index 83aae4747594..ffe22bc3ac8e 100644 --- a/drivers/pci/dmar.c +++ b/drivers/pci/dmar.c @@ -1456,7 +1456,7 @@ int dmar_reenable_qi(struct intel_iommu *iommu) /* * Check interrupt remapping support in DMAR table description. */ -int dmar_ir_support(void) +int __init dmar_ir_support(void) { struct acpi_table_dmar *dmar; dmar = (struct acpi_table_dmar *)dmar_tbl; |