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>