From 1a8e3b6cb4b7ce385486b6c591b1a331695e9431 Mon Sep 17 00:00:00 2001
From: Robert Reif <reif@earthlink.net>
Date: Mon, 14 May 2007 03:22:08 -0700
Subject: [PATCH] --- yaml --- r: 56367 b: refs/heads/master c:
 19fce2b96655d2b3b758e0f783314678d89b47c5 h: refs/heads/master i:   56365:
 cbf8a48b561da69043f747f86ed735c4a9e786ef   56363:
 378af0cdb2789adbcb333aa6c318d80f47dbe5dd   56359:
 827e2d2728e7a27c664da76108cc8be074e84c3f   56351:
 f9d600237d29b18c280cd5e33234fb413436fc95 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/sparc/kernel/head.S   | 2 +-
 trunk/include/asm-sparc/kdebug.h | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index b6e60122d203..41488ee4a94a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ac6d4a4b85004dbb907f1d3b34412afe16f3758
+refs/heads/master: 19fce2b96655d2b3b758e0f783314678d89b47c5
diff --git a/trunk/arch/sparc/kernel/head.S b/trunk/arch/sparc/kernel/head.S
index 97da13c52563..9a219e8b5ddb 100644
--- a/trunk/arch/sparc/kernel/head.S
+++ b/trunk/arch/sparc/kernel/head.S
@@ -19,7 +19,7 @@
 #include <asm/ptrace.h>
 #include <asm/psr.h>
 #include <asm/page.h>
-#include <linux/kdebug.h>
+#include <asm/kdebug.h>
 #include <asm/winmacro.h>
 #include <asm/thread_info.h>	/* TI_UWINMASK */
 #include <asm/errno.h>
diff --git a/trunk/include/asm-sparc/kdebug.h b/trunk/include/asm-sparc/kdebug.h
index 404d80767323..631f15ffef73 100644
--- a/trunk/include/asm-sparc/kdebug.h
+++ b/trunk/include/asm-sparc/kdebug.h
@@ -58,6 +58,10 @@ static inline void sp_enter_debugger(void)
 	       sp_enter_debugger(); \
 		       } while(0)
 
+enum die_val {
+	DIE_UNUSED,
+};
+
 #endif /* !(__ASSEMBLY__) */
 
 /* Some nice offset defines for assembler code. */
@@ -66,8 +70,4 @@ static inline void sp_enter_debugger(void)
 #define KDEBUG_DUNNO2_OFF   0x8
 #define KDEBUG_TEACH_OFF    0xc
 
-enum die_val {
-	DIE_UNUSED,
-};
-
 #endif /* !(_SPARC_KDEBUG_H) */