Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / x86 / kernel / traps.c

diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index c9a666cdd3db928278679f606c71a8006833065b..98c2d055284b32fb2ce6ff6776b9cb049c103ae0 100644 (file)
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -63,9 +63,6 @@
 #else
 #include <asm/processor-flags.h>
 #include <asm/arch_hooks.h>
 #else
 #include <asm/processor-flags.h>
 #include <asm/arch_hooks.h>

-#include <asm/nmi.h>
-#include <asm/smp.h>
-#include <asm/io.h>

 #include <asm/traps.h>
 
 #include "cpu/mcheck/mce.h"
 #include <asm/traps.h>
 
 #include "cpu/mcheck/mce.h"