Merge master.kernel.org:/home/rmk/linux-2.6-arm

0238cb4e · Linus Torvalds · 3527761c · ef0498a7 · 0238cb4e
Commit 0238cb4e authored Jan 15, 2006 by Linus Torvalds
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

include/asm-arm/mach/arch.h include/asm-arm/mach/arch.h +2 -0

No files found.
--- a/include/asm-arm/mach/arch.h
+++ b/include/asm-arm/mach/arch.h
@@ -10,6 +10,8 @@
 #ifndef __ASSEMBLY__
+#include <linux/compiler.h>
 struct tag;
 struct meminfo;
 struct sys_timer;