summaryrefslogtreecommitdiffstats
path: root/arch/ia64/configs
diff options
context:
space:
mode:
authorSuresh Siddha <suresh.b.siddha@intel.com>2011-08-23 17:05:25 -0700
committerIngo Molnar <mingo@elte.hu>2011-09-21 10:22:03 +0200
commitd3f138106b4b40640dc667f0222fd9f137387b32 (patch)
tree2c5d51deff32ec0999493bbb73cb18a7e4a455c3 /arch/ia64/configs
parentc39d77ffa28c6e72702193df4fa53928c1b6f3e6 (diff)
downloadlinux-d3f138106b4b40640dc667f0222fd9f137387b32.tar.gz
linux-d3f138106b4b40640dc667f0222fd9f137387b32.tar.bz2
linux-d3f138106b4b40640dc667f0222fd9f137387b32.zip
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/configs')
-rw-r--r--arch/ia64/configs/generic_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/configs/generic_defconfig b/arch/ia64/configs/generic_defconfig
index 0e5cd1405e0e..43ab1cd097a5 100644
--- a/arch/ia64/configs/generic_defconfig
+++ b/arch/ia64/configs/generic_defconfig
@@ -234,4 +234,4 @@ CONFIG_CRYPTO_MD5=y
# CONFIG_CRYPTO_ANSI_CPRNG is not set
CONFIG_CRC_T10DIF=y
CONFIG_MISC_DEVICES=y
-CONFIG_DMAR=y
+CONFIG_INTEL_IOMMU=y