diff options
| author | Suresh Siddha <suresh.b.siddha@intel.com> | 2011-08-24 00:05:25 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-09-21 08:22:03 (GMT) |
| commit | d3f138106b4b40640dc667f0222fd9f137387b32 (patch) | |
| tree | 2c5d51deff32ec0999493bbb73cb18a7e4a455c3 /arch/ia64/include/asm/device.h | |
| parent | c39d77ffa28c6e72702193df4fa53928c1b6f3e6 (diff) | |
| download | linux-fsl-qoriq-d3f138106b4b40640dc667f0222fd9f137387b32.tar.xz | |
iommu: Rename the DMAR and INTR_REMAP config options
Change the CONFIG_DMAR to CONFIG_INTEL_IOMMU to be consistent
with the other IOMMU options.
Rename the CONFIG_INTR_REMAP to CONFIG_IRQ_REMAP to match the
irq subsystem name.
And define the CONFIG_DMAR_TABLE for the common ACPI DMAR
routines shared by both CONFIG_INTEL_IOMMU and CONFIG_IRQ_REMAP.
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: yinghai@kernel.org
Cc: youquan.song@intel.com
Cc: joerg.roedel@amd.com
Cc: tony.luck@intel.com
Cc: dwmw2@infradead.org
Link: http://lkml.kernel.org/r/20110824001456.558630224@sbsiddha-desk.sc.intel.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/ia64/include/asm/device.h')
| -rw-r--r-- | arch/ia64/include/asm/device.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/device.h b/arch/ia64/include/asm/device.h index d66d446..d05e78f 100644 --- a/arch/ia64/include/asm/device.h +++ b/arch/ia64/include/asm/device.h @@ -10,7 +10,7 @@ struct dev_archdata { #ifdef CONFIG_ACPI void *acpi_handle; #endif -#ifdef CONFIG_DMAR +#ifdef CONFIG_INTEL_IOMMU void *iommu; /* hook for IOMMU specific extension */ #endif }; |