summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-15 13:33:09 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-15 13:33:09 -0800
commit0238cb4e7583c521bb3538060f98a73e65f61324 (patch)
tree87081082bfd5c89fddfc1b351f31f6b5a14bfce5 /include
parent3527761cb403fba72a37c4e6a1fad76eeedd990c (diff)
parentef0498a7bfbb5773e7ba4235207054b81ad5120e (diff)
downloadtalos-obmc-linux-0238cb4e7583c521bb3538060f98a73e65f61324.tar.gz
talos-obmc-linux-0238cb4e7583c521bb3538060f98a73e65f61324.zip
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include')
-rw-r--r--include/asm-arm/mach/arch.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-arm/mach/arch.h b/include/asm-arm/mach/arch.h
index 8222bf9fc366..2cd57b4d64d9 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;
OpenPOWER on IntegriCloud