diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-15 16:33:09 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-15 16:33:09 -0500 |
| commit | 0238cb4e7583c521bb3538060f98a73e65f61324 (patch) | |
| tree | 87081082bfd5c89fddfc1b351f31f6b5a14bfce5 /include | |
| parent | 3527761cb403fba72a37c4e6a1fad76eeedd990c (diff) | |
| parent | ef0498a7bfbb5773e7ba4235207054b81ad5120e (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/mach/arch.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-arm/mach/arch.h b/include/asm-arm/mach/arch.h index 8222bf9fc36..2cd57b4d64d 100644 --- a/include/asm-arm/mach/arch.h +++ b/include/asm-arm/mach/arch.h | |||
| @@ -10,6 +10,8 @@ | |||
| 10 | 10 | ||
| 11 | #ifndef __ASSEMBLY__ | 11 | #ifndef __ASSEMBLY__ |
| 12 | 12 | ||
| 13 | #include <linux/compiler.h> | ||
| 14 | |||
| 13 | struct tag; | 15 | struct tag; |
| 14 | struct meminfo; | 16 | struct meminfo; |
| 15 | struct sys_timer; | 17 | struct sys_timer; |