Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-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 758712f1c88f8767016a477351aacb97735f47d8..7b4739dc8f3f28387ac71a26e11089dddbc1cff5 100644 (file)
--- a/include/asm-mips/bug.h
+++ b/include/asm-mips/bug.h
@@ -1,22 +1,20 @@
 #ifndef __ASM_BUG_H
 #define __ASM_BUG_H
 
-#include <linux/config.h>
 
 #ifdef CONFIG_BUG
 
 #include <asm/break.h>
 
-#ifdef CONFIG_BUG
-#define HAVE_ARCH_BUG
 #define BUG()                                                          \
 do {                                                                   \
        __asm__ __volatile__("break %0" : : "i" (BRK_BUG));             \
 } while (0)
-#endif
 
-#include <asm-generic/bug.h>
+#define HAVE_ARCH_BUG
 
 #endif
 
+#include <asm-generic/bug.h>
+
 #endif /* __ASM_BUG_H */