From 364b0a317dca7027efc7c92dc518b9df2664973a Mon Sep 17 00:00:00 2001
From: Huang Weiyi <weiyi.huang@gmail.com>
Date: Sun, 11 May 2008 19:36:57 +0800
Subject: [PATCH] --- yaml --- r: 99376 b: refs/heads/master c:
 883b7af932b4435eb4798cfa4fec0848639c2a87 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/kernel/smpboot.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0b009f3663f0..c5ee63ff390f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2cc74111c78dbc7b26c41b4e87cfebfc3aed49c4
+refs/heads/master: 883b7af932b4435eb4798cfa4fec0848639c2a87
diff --git a/trunk/arch/x86/kernel/smpboot.c b/trunk/arch/x86/kernel/smpboot.c
index 38988491c622..0974fc0997b9 100644
--- a/trunk/arch/x86/kernel/smpboot.c
+++ b/trunk/arch/x86/kernel/smpboot.c
@@ -59,7 +59,6 @@
 #include <asm/pgtable.h>
 #include <asm/tlbflush.h>
 #include <asm/mtrr.h>
-#include <asm/nmi.h>
 #include <asm/vmi.h>
 #include <asm/genapic.h>
 #include <linux/mc146818rtc.h>