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/include/asm/machvec.h | |
| parent | 22ca532a4d137545244fdff0b687325fd4e13eae (diff) | |
| parent | 62fdd7678a26efadd6ac5c2869543caff77d2df0 (diff) | |
| download | blackbird-op-linux-fe393164c529f72def1952fb66c11732d0984d78.tar.gz blackbird-op-linux-fe393164c529f72def1952fb66c11732d0984d78.zip | |
Pull vtd-iommu into release branch
Conflicts:
arch/ia64/kernel/acpi.c
Diffstat (limited to 'arch/ia64/include/asm/machvec.h')
| -rw-r--r-- | arch/ia64/include/asm/machvec.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/machvec.h b/arch/ia64/include/asm/machvec.h index de99cb2799cf..1ea28bcee33b 100644 --- a/arch/ia64/include/asm/machvec.h +++ b/arch/ia64/include/asm/machvec.h @@ -120,6 +120,8 @@ extern void machvec_tlb_migrate_finish (struct mm_struct *); # include <asm/machvec_hpsim.h> # elif defined (CONFIG_IA64_DIG) # include <asm/machvec_dig.h> +# elif defined(CONFIG_IA64_DIG_VTD) +# include <asm/machvec_dig_vtd.h> # elif defined (CONFIG_IA64_HP_ZX1) # include <asm/machvec_hpzx1.h> # elif defined (CONFIG_IA64_HP_ZX1_SWIOTLB) |
