Merge master.kernel.org:/home/rmk/linux-2.6-arm
diff --git a/include/asm-arm/mach/arch.h b/include/asm-arm/mach/arch.h
index 8222bf9..2cd57b4 100644
--- 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;