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