diff options
| author | Suresh Siddha <suresh.b.siddha@intel.com> | 2011-08-23 17:05:25 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-09-21 10:22:03 +0200 |
| commit | d3f138106b4b40640dc667f0222fd9f137387b32 (patch) | |
| tree | 2c5d51deff32ec0999493bbb73cb18a7e4a455c3 /arch/x86/configs | |
| parent | c39d77ffa28c6e72702193df4fa53928c1b6f3e6 (diff) | |
| download | linux-stable-d3f138106b4b40640dc667f0222fd9f137387b32.tar.gz linux-stable-d3f138106b4b40640dc667f0222fd9f137387b32.tar.bz2 linux-stable-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/x86/configs')
| -rw-r--r-- | arch/x86/configs/x86_64_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig index 22a0dc8e51dd..058a35b8286c 100644 --- a/arch/x86/configs/x86_64_defconfig +++ b/arch/x86/configs/x86_64_defconfig @@ -67,8 +67,8 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_ONDEMAND=y CONFIG_X86_ACPI_CPUFREQ=y CONFIG_PCI_MMCONFIG=y -CONFIG_DMAR=y -# CONFIG_DMAR_DEFAULT_ON is not set +CONFIG_INTEL_IOMMU=y +# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set CONFIG_PCIEPORTBUS=y CONFIG_PCCARD=y CONFIG_YENTA=y |