Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild

[powerpc.git] / include / asm-mips / bug.h

diff --git a/include/asm-mips/bug.h b/include/asm-mips/bug.h
index 8e1144f..87d49a5 100644 (file)
--- a/include/asm-mips/bug.h
+++ b/include/asm-mips/bug.h
@@ -7,13 +7,12 @@
 
 #include <asm/break.h>
 
-#ifdef CONFIG_BUG
-#define HAVE_ARCH_BUG
 #define BUG()                                                          \
 do {                                                                   \
        __asm__ __volatile__("break %0" : : "i" (BRK_BUG));             \
 } while (0)
-#endif
+
+#define HAVE_ARCH_BUG
 
 #endif