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

0238cb4e · Linus Torvalds · 3527761c · ef0498a7 · 0238cb4e
隐藏空白更改
内联并排

Showing with 2 addition and 0 deletion

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

未找到文件。
--- 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;