diff options
| author | Tony Luck <tony.luck@intel.com> | 2008-10-17 13:52:22 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2008-10-17 13:52:22 -0700 |
| commit | fe393164c529f72def1952fb66c11732d0984d78 (patch) | |
| tree | 56e4425988e90cb9608e95844f577cd18009618c /arch/ia64/configs | |
| parent | 22ca532a4d137545244fdff0b687325fd4e13eae (diff) | |
| parent | 62fdd7678a26efadd6ac5c2869543caff77d2df0 (diff) | |
Pull vtd-iommu into release branch
Conflicts:
arch/ia64/kernel/acpi.c
Diffstat (limited to 'arch/ia64/configs')
| -rw-r--r-- | arch/ia64/configs/generic_defconfig | 2 | ||||
| -rw-r--r-- | arch/ia64/configs/tiger_defconfig | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/ia64/configs/generic_defconfig b/arch/ia64/configs/generic_defconfig index 9f483976228..e05f9e1d3fa 100644 --- a/arch/ia64/configs/generic_defconfig +++ b/arch/ia64/configs/generic_defconfig @@ -233,6 +233,8 @@ CONFIG_DMIID=y CONFIG_BINFMT_ELF=y CONFIG_BINFMT_MISC=m +# CONFIG_DMAR is not set + # # Power management and ACPI # diff --git a/arch/ia64/configs/tiger_defconfig b/arch/ia64/configs/tiger_defconfig index 797acf9066c..c522edf23c6 100644 --- a/arch/ia64/configs/tiger_defconfig +++ b/arch/ia64/configs/tiger_defconfig @@ -172,6 +172,8 @@ CONFIG_DMIID=y CONFIG_BINFMT_ELF=y CONFIG_BINFMT_MISC=m +# CONFIG_DMAR is not set + # # Power management and ACPI # |