diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-01 18:53:45 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-01 18:53:45 +0100 |
commit | 657e1de8e742cf81153d2d15545948bd58294200 (patch) | |
tree | 0fa3df23305e3763027f819cde6016dde8b24223 /arch/arm/mach-realview/include/mach/memory.h | |
parent | [ARM] 5336/1: Formatting/Whitespace cleanups in mach-sa1100 (diff) | |
parent | RealView: Select CPU_V6 for MACH_REALVIEW_PB11MP (diff) | |
download | linux-657e1de8e742cf81153d2d15545948bd58294200.tar.xz linux-657e1de8e742cf81153d2d15545948bd58294200.zip |
Merge branch 'for-rmk-realview' of git://linux-arm.org/linux-2.6 into devel
Diffstat (limited to 'arch/arm/mach-realview/include/mach/memory.h')
-rw-r--r-- | arch/arm/mach-realview/include/mach/memory.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-realview/include/mach/memory.h b/arch/arm/mach-realview/include/mach/memory.h index 65a0742094f7..293c30025e7e 100644 --- a/arch/arm/mach-realview/include/mach/memory.h +++ b/arch/arm/mach-realview/include/mach/memory.h @@ -23,6 +23,10 @@ /* * Physical DRAM offset. */ +#ifdef CONFIG_REALVIEW_HIGH_PHYS_OFFSET +#define PHYS_OFFSET UL(0x70000000) +#else #define PHYS_OFFSET UL(0x00000000) +#endif #endif |