diff options
| author | Suresh Siddha <suresh.b.siddha@intel.com> | 2011-08-24 04:05:25 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-09-21 12:22:03 +0400 |
| commit | d3f138106b4b40640dc667f0222fd9f137387b32 (patch) | |
| tree | 2c5d51deff32ec0999493bbb73cb18a7e4a455c3 /arch/ia64/include/asm/iommu.h | |
| parent | c39d77ffa28c6e72702193df4fa53928c1b6f3e6 (diff) | |
| download | linux-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/iommu.h')
| -rw-r--r-- | arch/ia64/include/asm/iommu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/iommu.h b/arch/ia64/include/asm/iommu.h index 95461bb0b8e6..105c93b00b1b 100644 --- a/arch/ia64/include/asm/iommu.h +++ b/arch/ia64/include/asm/iommu.h @@ -7,7 +7,7 @@ extern void pci_iommu_shutdown(void); extern void no_iommu_init(void); -#ifdef CONFIG_DMAR +#ifdef CONFIG_INTEL_IOMMU extern int force_iommu, no_iommu; extern int iommu_pass_through; extern int iommu_detected; |