From fda63a258ef2fb631ee3297137f1c26bc747ea5e Mon Sep 17 00:00:00 2001
From: Christoph Lameter <cl@linux-foundation.org>
Date: Mon, 4 Jan 2010 16:34:46 -0600
Subject: [PATCH] --- yaml --- r: 185019 b: refs/heads/master c:
 dbfc196a3cc1a2514ad0737a82f764de23bd65e6 h: refs/heads/master i:   185017:
 6e9e3bb20c317f32db80d14c6634e571803c9ba5   185015:
 81eabd4253c588a6d2034cb62febd9aff0a42a64 v: v3

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

diff --git a/[refs] b/[refs]
index 599fca2dabea..3547427b8463 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad596925eaf9a48ed61bc9210088828f1f8e0552
+refs/heads/master: dbfc196a3cc1a2514ad0737a82f764de23bd65e6
diff --git a/trunk/arch/sparc/kernel/nmi.c b/trunk/arch/sparc/kernel/nmi.c
index 2ad288ff99a4..9b9f5b4e2994 100644
--- a/trunk/arch/sparc/kernel/nmi.c
+++ b/trunk/arch/sparc/kernel/nmi.c
@@ -21,7 +21,6 @@
 
 #include <asm/perf_event.h>
 #include <asm/ptrace.h>
-#include <asm/local.h>
 #include <asm/pcr.h>
 
 /* We don't have a real NMI on sparc64, but we can fake one