diff options
| author | Tony Luck <tony.luck@intel.com> | 2008-10-17 16:52:22 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2008-10-17 16:52:22 -0400 |
| commit | fe393164c529f72def1952fb66c11732d0984d78 (patch) | |
| tree | 56e4425988e90cb9608e95844f577cd18009618c /arch/ia64/Makefile | |
| parent | 22ca532a4d137545244fdff0b687325fd4e13eae (diff) | |
| parent | 62fdd7678a26efadd6ac5c2869543caff77d2df0 (diff) | |
Pull vtd-iommu into release branch
Conflicts:
arch/ia64/kernel/acpi.c
Diffstat (limited to 'arch/ia64/Makefile')
| -rw-r--r-- | arch/ia64/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile index 40242501bcd..58a7e46affd 100644 --- a/arch/ia64/Makefile +++ b/arch/ia64/Makefile | |||
| @@ -53,6 +53,7 @@ libs-y += arch/ia64/lib/ | |||
| 53 | core-y += arch/ia64/kernel/ arch/ia64/mm/ | 53 | core-y += arch/ia64/kernel/ arch/ia64/mm/ |
| 54 | core-$(CONFIG_IA32_SUPPORT) += arch/ia64/ia32/ | 54 | core-$(CONFIG_IA32_SUPPORT) += arch/ia64/ia32/ |
| 55 | core-$(CONFIG_IA64_DIG) += arch/ia64/dig/ | 55 | core-$(CONFIG_IA64_DIG) += arch/ia64/dig/ |
| 56 | core-$(CONFIG_IA64_DIG_VTD) += arch/ia64/dig/ | ||
| 56 | core-$(CONFIG_IA64_GENERIC) += arch/ia64/dig/ | 57 | core-$(CONFIG_IA64_GENERIC) += arch/ia64/dig/ |
| 57 | core-$(CONFIG_IA64_HP_ZX1) += arch/ia64/dig/ | 58 | core-$(CONFIG_IA64_HP_ZX1) += arch/ia64/dig/ |
| 58 | core-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/dig/ | 59 | core-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/dig/ |