Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[deliverable/linux.git] / include / asm-ppc / bug.h

diff --git a/include/asm-ppc/bug.h b/include/asm-ppc/bug.h
index e99c6cb9d61896dcafa3a859d2c9ab1767c213be..8b34fd682b0dae9776fa29316cb58278a603a954 100644 (file)
--- a/include/asm-ppc/bug.h
+++ b/include/asm-ppc/bug.h
@@ -14,6 +14,7 @@ struct bug_entry {
  */
 #define BUG_WARNING_TRAP       0x1000000
 
+#ifdef CONFIG_BUG
 #define BUG() do {                                                      \
        __asm__ __volatile__(                                            \
                "1:     twi 31,0,0\n"                                    \
@@ -50,6 +51,8 @@ struct bug_entry {
 #define HAVE_ARCH_BUG
 #define HAVE_ARCH_BUG_ON
 #define HAVE_ARCH_WARN_ON
+#endif
+
 #include <asm-generic/bug.h>
 
 #endif