From: Adrian Bunk <bunk@stusta.de>

In file included from
/home/bunk/linux/kernel-2.6/linux-2.6.19-rc6-mm1/arch/i386/kernel/traps.c:32:
/home/bunk/linux/kernel-2.6/linux-2.6.19-rc6-mm1/include/linux/bug.h:38: warning: type defaults to 'int' in declaration of 'Elf_Ehdr'
/home/bunk/linux/kernel-2.6/linux-2.6.19-rc6-mm1/include/linux/bug.h:38: error: expected ';', ',' or ')' before '*' token
...

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/linux/bug.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN include/linux/bug.h~generic-bug-implementation-include-linux-bugh-must-always-include-linux-moduleh include/linux/bug.h
--- a/include/linux/bug.h~generic-bug-implementation-include-linux-bugh-must-always-include-linux-moduleh
+++ a/include/linux/bug.h
@@ -1,6 +1,7 @@
 #ifndef _LINUX_BUG_H
 #define _LINUX_BUG_H
 
+#include <linux/module.h>
 #include <asm/bug.h>
 
 enum bug_trap_type {
@@ -10,7 +11,6 @@ enum bug_trap_type {
 };
 
 #ifdef CONFIG_GENERIC_BUG
-#include <linux/module.h>
 #include <asm-generic/bug.h>
 
 static inline int is_warning_bug(const struct bug_entry *bug)
_