summaryrefslogtreecommitdiffstats
path: root/arch/ia64/Makefile
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2008-10-17 13:52:22 -0700
committerTony Luck <tony.luck@intel.com>2008-10-17 13:52:22 -0700
commitfe393164c529f72def1952fb66c11732d0984d78 (patch)
tree56e4425988e90cb9608e95844f577cd18009618c /arch/ia64/Makefile
parent22ca532a4d137545244fdff0b687325fd4e13eae (diff)
parent62fdd7678a26efadd6ac5c2869543caff77d2df0 (diff)
downloadop-kernel-dev-fe393164c529f72def1952fb66c11732d0984d78.zip
op-kernel-dev-fe393164c529f72def1952fb66c11732d0984d78.tar.gz
Pull vtd-iommu into release branch
Conflicts: arch/ia64/kernel/acpi.c
Diffstat (limited to 'arch/ia64/Makefile')
-rw-r--r--arch/ia64/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
index 4024250..58a7e46a 100644
--- a/arch/ia64/Makefile
+++ b/arch/ia64/Makefile
@@ -53,6 +53,7 @@ libs-y += arch/ia64/lib/
core-y += arch/ia64/kernel/ arch/ia64/mm/
core-$(CONFIG_IA32_SUPPORT) += arch/ia64/ia32/
core-$(CONFIG_IA64_DIG) += arch/ia64/dig/
+core-$(CONFIG_IA64_DIG_VTD) += arch/ia64/dig/
core-$(CONFIG_IA64_GENERIC) += arch/ia64/dig/
core-$(CONFIG_IA64_HP_ZX1) += arch/ia64/dig/
core-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/dig/
OpenPOWER on IntegriCloud