Merge git://git.infradead.org/mtd-2.6

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

diff --git a/include/asm-arm/bug.h b/include/asm-arm/bug.h
index 24d11672eb601979d2ca64e3adf60dc923dfe22a..5ab8216f5204aa7f204cd5b34fffb228428ff618 100644 (file)
--- a/include/asm-arm/bug.h
+++ b/include/asm-arm/bug.h
@@ -2,10 +2,11 @@
 #define _ASMARM_BUG_H
 
 #include <linux/config.h>
+#include <linux/stddef.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, void *data) __attribute__((noreturn));
 
 /* give file/line information */
 #define BUG()          __bug(__FILE__, __LINE__, NULL)