Merge bk://kernel.bkbits.net/davem/sparc-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Merge bk://kernel.bkbits.net/davem/sparc-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
5438f37d · Linus Torvalds · 35fdc2d8 · 2b188596 · 5438f37d
Commit 5438f37d authored Jun 22, 2004 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

include/asm-sparc64/bug.h include/asm-sparc64/bug.h +2 -0

No files found.
--- a/include/asm-sparc64/bug.h
+++ b/include/asm-sparc64/bug.h
@@ -3,6 +3,8 @@
 #ifndef _SPARC64_BUG_H
 #define _SPARC64_BUG_H
+#include <linux/compiler.h>
 #ifdef CONFIG_DEBUG_BUGVERBOSE
 extern void do_BUG(const char *file, int line);
 #define BUG() do {					\