Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6

[linux-2.6] / include / asm-mips / bug.h

diff --git a/include/asm-mips/bug.h b/include/asm-mips/bug.h
index eb94bb96cfbcbcc2389d3a846b774f6b075b6734..7b4739dc8f3f28387ac71a26e11089dddbc1cff5 100644 (file)
--- a/include/asm-mips/bug.h
+++ b/include/asm-mips/bug.h
@@ -1,6 +1,9 @@
 #ifndef __ASM_BUG_H
 #define __ASM_BUG_H
 
+
+#ifdef CONFIG_BUG
+
 #include <asm/break.h>
 
 #define BUG()                                                          \
@@ -9,6 +12,9 @@ do {                                                                   \
 } while (0)
 
 #define HAVE_ARCH_BUG
-#include <asm-generic/bug.h>
 
 #endif
+
+#include <asm-generic/bug.h>
+
+#endif /* __ASM_BUG_H */