diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-01 12:53:45 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-01 12:53:45 -0500 |
| commit | 657e1de8e742cf81153d2d15545948bd58294200 (patch) | |
| tree | 0fa3df23305e3763027f819cde6016dde8b24223 /arch/arm/mach-realview/include/mach/memory.h | |
| parent | 93982535a201399c0023c1166a7f16a335134d5a (diff) | |
| parent | 6f13d278836d7251168631faeb0cbf5e4cdd98e5 (diff) | |
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 @@ | |||
| 23 | /* | 23 | /* |
| 24 | * Physical DRAM offset. | 24 | * Physical DRAM offset. |
| 25 | */ | 25 | */ |
| 26 | #ifdef CONFIG_REALVIEW_HIGH_PHYS_OFFSET | ||
| 27 | #define PHYS_OFFSET UL(0x70000000) | ||
| 28 | #else | ||
| 26 | #define PHYS_OFFSET UL(0x00000000) | 29 | #define PHYS_OFFSET UL(0x00000000) |
| 30 | #endif | ||
| 27 | 31 | ||
| 28 | #endif | 32 | #endif |