fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / asm-arm / bug.h

diff --git a/include/asm-arm/bug.h b/include/asm-arm/bug.h
index 5e91b90..7b62351 100644 (file)
--- a/include/asm-arm/bug.h
+++ b/include/asm-arm/bug.h
@@ -1,13 +1,13 @@
 #ifndef _ASMARM_BUG_H
 #define _ASMARM_BUG_H
 
-#include <linux/config.h>
 
+#ifdef CONFIG_BUG
 #ifdef CONFIG_DEBUG_BUGVERBOSE
-extern volatile void __bug(const char *file, int line, void *data);
+extern void __bug(const char *file, int line) __attribute__((noreturn));
 
 /* give file/line information */
-#define BUG()          __bug(__FILE__, __LINE__, NULL)
+#define BUG()          __bug(__FILE__, __LINE__)
 
 #else
 
@@ -17,6 +17,8 @@ extern volatile void __bug(const char *file, int line, void *data);
 #endif
 
 #define HAVE_ARCH_BUG
+#endif
+
 #include <asm-generic/bug.h>
 
 #endif