aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-11-08 04:58:00 -0500
committerPaul Mundt <lethal@linux-sh.org>2008-01-27 23:18:39 -0500
commite1cd93ea44cb55969e122758c8cc2ddfe21b74b3 (patch)
treec97bbf12fee72fc97bf577132b896c9551491fbc
parent5a4a5bd127c147aaa16aefef856f4cb28e92cec1 (diff)
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>
-rw-r--r--include/asm-sh/bug.h4
1 files 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 @@
3 3
4#define TRAPA_BUG_OPCODE 0xc33e /* trapa #0x3e */ 4#define TRAPA_BUG_OPCODE 0xc33e /* trapa #0x3e */
5 5
6#ifdef CONFIG_BUG 6#ifdef CONFIG_GENERIC_BUG
7#define HAVE_ARCH_BUG 7#define HAVE_ARCH_BUG
8#define HAVE_ARCH_WARN_ON 8#define HAVE_ARCH_WARN_ON
9 9
@@ -77,7 +77,7 @@ struct pt_regs;
77/* arch/sh/kernel/traps.c */ 77/* arch/sh/kernel/traps.c */
78void handle_BUG(struct pt_regs *); 78void handle_BUG(struct pt_regs *);
79 79
80#endif /* CONFIG_BUG */ 80#endif /* CONFIG_GENERIC_BUG */
81 81
82#include <asm-generic/bug.h> 82#include <asm-generic/bug.h>
83 83