diff options
| author | Tony Luck | 2008-10-17 22:52:22 +0200 |
|---|---|---|
| committer | Tony Luck | 2008-10-17 22:52:22 +0200 |
| commit | fe393164c529f72def1952fb66c11732d0984d78 (patch) | |
| tree | 56e4425988e90cb9608e95844f577cd18009618c /arch/ia64/kernel/Makefile | |
| parent | Pull pv_ops-xen into release branch (diff) | |
| parent | [IA64] Add Variable Page Size and IA64 Support in Intel IOMMU (diff) | |
| download | kernel-qcow2-linux-fe393164c529f72def1952fb66c11732d0984d78.tar.gz kernel-qcow2-linux-fe393164c529f72def1952fb66c11732d0984d78.tar.xz kernel-qcow2-linux-fe393164c529f72def1952fb66c11732d0984d78.zip | |
Pull vtd-iommu into release branch
Conflicts:
arch/ia64/kernel/acpi.c
Diffstat (limited to 'arch/ia64/kernel/Makefile')
| -rw-r--r-- | arch/ia64/kernel/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile index 55e6ca8eebda..c381ea954892 100644 --- a/arch/ia64/kernel/Makefile +++ b/arch/ia64/kernel/Makefile @@ -42,6 +42,10 @@ obj-$(CONFIG_IA64_ESI) += esi.o ifneq ($(CONFIG_IA64_ESI),) obj-y += esi_stub.o # must be in kernel proper endif +obj-$(CONFIG_DMAR) += pci-dma.o +ifeq ($(CONFIG_DMAR), y) +obj-$(CONFIG_SWIOTLB) += pci-swiotlb.o +endif # The gate DSO image is built using a special linker script. targets += gate.so gate-syms.o |