Merge branch 'master' into upstream

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

diff --git a/include/asm-arm/bug.h b/include/asm-arm/bug.h
index 7fb02138f585985dd810407a82a8643bb3874d9f..5ab8216f5204aa7f204cd5b34fffb228428ff618 100644 (file)
--- a/include/asm-arm/bug.h
+++ b/include/asm-arm/bug.h
@@ -2,6 +2,7 @@
 #define _ASMARM_BUG_H
 
 #include <linux/config.h>
+#include <linux/stddef.h>
 
 #ifdef CONFIG_BUG
 #ifdef CONFIG_DEBUG_BUGVERBOSE