From e1cd93ea44cb55969e122758c8cc2ddfe21b74b3 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Thu, 8 Nov 2007 18:58:00 +0900
Subject: sh: BUGFLAG_WARNING needs GENERIC_BUG.

Move the HAVE_ARCH_BUG/HAVE_ARCH_WARN_ON definitions underneath
CONFIG_GENERIC_BUG. This is needed for BUGFLAG_WARNING usage.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---
 include/asm-sh/bug.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/asm-sh/bug.h b/include/asm-sh/bug.h
index a78d482e8b2f..afb1c2723ec7 100644
--- a/include/asm-sh/bug.h
+++ b/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>
 
-- 
cgit v1.2.3