lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pull vtd-iommu into release branch

Browse Source 
Conflicts:
	arch/ia64/kernel/acpi.c
This commit is contained in:
Tony Luck
2008-10-17 13:52:22 -07:00
parent 22ca532a4d 62fdd7678a
commit fe393164c5
23 changed files with 620 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/ia64/include/asm/machvec.h
View File

@@ -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)