diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-22 13:31:09 -0500 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-22 13:31:09 -0500 |
| commit | d00a78d9409bee2e3bb7174a1810c0a655b4eaf4 (patch) | |
| tree | 54c0dbbaa81b7b540ef030ae83b2fb737f4e16ce /arch/arm/mach-cns3xxx/include/mach/memory.h | |
| parent | 31e5a9c1e13d66a4fd53911a52911fb992f1f734 (diff) | |
| parent | 3a6b1676c6f27f7fad1a3d6fab5a95f90b1e7402 (diff) | |
Merge remote-tracking branch 'rmk/p2v-stable' into linaro-2.6.38
Conflicts:
arch/arm/kernel/module.c
Diffstat (limited to 'arch/arm/mach-cns3xxx/include/mach/memory.h')
| -rw-r--r-- | arch/arm/mach-cns3xxx/include/mach/memory.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-cns3xxx/include/mach/memory.h b/arch/arm/mach-cns3xxx/include/mach/memory.h index 3b6b769b7a2..dc16c5c5d86 100644 --- a/arch/arm/mach-cns3xxx/include/mach/memory.h +++ b/arch/arm/mach-cns3xxx/include/mach/memory.h @@ -13,7 +13,7 @@ /* * Physical DRAM offset. */ -#define PHYS_OFFSET UL(0x00000000) +#define PLAT_PHYS_OFFSET UL(0x00000000) #define __phys_to_bus(x) ((x) + PHYS_OFFSET) #define __bus_to_phys(x) ((x) - PHYS_OFFSET) |