From: Jon Mason Fix a double definition of force_iommu, and move no_iommu to be with the rest of the IOMMU variables. Signed-off-by: Jon Mason Signed-off-by: Adrian Bunk Cc: Andi Kleen Signed-off-by: Andrew Morton --- include/asm-x86_64/proto.h | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) diff -puN include/asm-x86_64/proto.h~x86-64-fix-double-definition-of-force_iommu include/asm-x86_64/proto.h --- devel/include/asm-x86_64/proto.h~x86-64-fix-double-definition-of-force_iommu 2006-03-13 18:11:21.000000000 -0800 +++ devel-akpm/include/asm-x86_64/proto.h 2006-03-13 18:11:21.000000000 -0800 @@ -107,7 +107,6 @@ extern void __init no_iommu_init(void); extern unsigned long table_start, table_end; extern int exception_trace; -extern int force_iommu, no_iommu; extern int using_apic_timer; extern int disable_apic; extern unsigned cpu_khz; @@ -128,6 +127,7 @@ extern int fix_aperture; #define iommu_aperture_allowed 0 #endif extern int force_iommu; +extern int no_iommu; extern int reboot_force; extern int notsc_setup(char *); _