diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-01 10:39:48 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-01 10:39:48 +1100 |
commit | 76beb38157a5fae20f712dd1917a422b92570a2a (patch) | |
tree | 5e615075a02ff2e97e9913acabc22caa3bfe4b9c | |
parent | 59e4926aa2a60ac56342304538d7c5c9b7dab91f (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; |