X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-v850%2Fbug.h;h=b0ed2d35f3e830293f56de96d1fd8a82e5ea0f95;hb=8707d8b8c0cbdf4441507f8dded194167da896c7;hp=c778916bf7f2c1410c02387e5b27a3d81f24333f;hpb=1da177e4c3f41524e886b7f1b8a0c1fc7321cac2;p=linux-2.6

diff --git a/include/asm-v850/bug.h b/include/asm-v850/bug.h
index c778916bf7..b0ed2d35f3 100644
--- a/include/asm-v850/bug.h
+++ b/include/asm-v850/bug.h
@@ -14,9 +14,12 @@
 #ifndef __V850_BUG_H__
 #define __V850_BUG_H__
 
+#ifdef CONFIG_BUG
 extern void __bug (void) __attribute__ ((noreturn));
 #define BUG()		__bug()
 #define HAVE_ARCH_BUG
+#endif
+
 #include <asm-generic/bug.h>
 
 #endif /* __V850_BUG_H__ */