diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-02 02:02:13 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-02 02:02:13 +0200 |
| commit | b620cc2cd80393b9a0f9a76806cb7f9e91671dac (patch) | |
| tree | 6291cc977570bfbdd209fb55602806b8f4cd8d11 /arch/arm | |
| parent | [PATCH] ppc32: Add new iBook 12" to PowerMac models table (diff) | |
| parent | [ARM] 2945/1: ARM fortunet fails to build because of missing include (diff) | |
| download | linux-b620cc2cd80393b9a0f9a76806cb7f9e91671dac.tar.xz linux-b620cc2cd80393b9a0f9a76806cb7f9e91671dac.zip | |
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 @@ #include <asm/mach/arch.h> +#include <asm/memory.h> + #include "common.h" struct meminfo memmap = { |