Merge branches 'bugzilla-12461' and 'bugzilla-9998' into release

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

diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
index 45a09ccdc2145e4c1b10b4cf1d0ce0715a7a5fc8..7228979f1e7f11015e2443cd7038a1b3f07f7cad 100644 (file)
--- a/arch/x86/kernel/nmi.c
+++ b/arch/x86/kernel/nmi.c
@@ -26,7 +26,6 @@
 #include <linux/kernel_stat.h>
 #include <linux/kdebug.h>
 #include <linux/smp.h>
-#include <linux/nmi.h>
 
 #include <asm/i8259.h>
 #include <asm/io_apic.h>