From 9fb8f7a15e0481cdcfae44438615c9ce04c07c83 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Thu, 8 Nov 2007 18:58:00 +0900
Subject: [PATCH] --- yaml --- r: 77679 b: refs/heads/master c:
 e1cd93ea44cb55969e122758c8cc2ddfe21b74b3 h: refs/heads/master i:   77677:
 8affb76027fb0c1ae2402dfaee82c45fa5115e87   77675:
 0aa820044e9b9a9f5665d815bfe9613485e64386   77671:
 c45e271a4c89216711fa7bcc58dce25d340d77ec   77663:
 4812d916fc62b6732aab4f1295107af5e569f3f3 v: v3

---
 [refs]                     | 2 +-
 trunk/include/asm-sh/bug.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 53add53e32b7..a190b1bed5be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a4a5bd127c147aaa16aefef856f4cb28e92cec1
+refs/heads/master: e1cd93ea44cb55969e122758c8cc2ddfe21b74b3
diff --git a/trunk/include/asm-sh/bug.h b/trunk/include/asm-sh/bug.h
index a78d482e8b2f..afb1c2723ec7 100644
--- a/trunk/include/asm-sh/bug.h
+++ b/trunk/include/asm-sh/bug.h
@@ -3,7 +3,7 @@
 
 #define TRAPA_BUG_OPCODE	0xc33e	/* trapa #0x3e */
 
-#ifdef CONFIG_BUG
+#ifdef CONFIG_GENERIC_BUG
 #define HAVE_ARCH_BUG
 #define HAVE_ARCH_WARN_ON
 
@@ -77,7 +77,7 @@ struct pt_regs;
 /* arch/sh/kernel/traps.c */
 void handle_BUG(struct pt_regs *);
 
-#endif /* CONFIG_BUG */
+#endif /* CONFIG_GENERIC_BUG */
 
 #include <asm-generic/bug.h>