diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-01 20:02:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-01 20:02:13 -0400 |
| commit | b620cc2cd80393b9a0f9a76806cb7f9e91671dac (patch) | |
| tree | 6291cc977570bfbdd209fb55602806b8f4cd8d11 /arch/arm | |
| parent | 036bfdcb0dfa39fc1ff5ded196b5fd92f1bb9ea8 (diff) | |
| parent | 31f919c3296a30427b18458b13c308513a62c3b9 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-clps711x/fortunet.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-clps711x/fortunet.c b/arch/arm/mach-clps711x/fortunet.c index f83a59761e02..3d88da0c287b 100644 --- a/arch/arm/mach-clps711x/fortunet.c +++ b/arch/arm/mach-clps711x/fortunet.c | |||
| @@ -31,6 +31,8 @@ | |||
| 31 | 31 | ||
| 32 | #include <asm/mach/arch.h> | 32 | #include <asm/mach/arch.h> |
| 33 | 33 | ||
| 34 | #include <asm/memory.h> | ||
| 35 | |||
| 34 | #include "common.h" | 36 | #include "common.h" |
| 35 | 37 | ||
| 36 | struct meminfo memmap = { | 38 | struct meminfo memmap = { |