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-davinci/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-davinci/include/mach/memory.h')
| -rw-r--r-- | arch/arm/mach-davinci/include/mach/memory.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/include/mach/memory.h b/arch/arm/mach-davinci/include/mach/memory.h index 22eb97c1c30..78822723f38 100644 --- a/arch/arm/mach-davinci/include/mach/memory.h +++ b/arch/arm/mach-davinci/include/mach/memory.h @@ -26,9 +26,9 @@ #if defined(CONFIG_ARCH_DAVINCI_DA8XX) && defined(CONFIG_ARCH_DAVINCI_DMx) #error Cannot enable DaVinci and DA8XX platforms concurrently #elif defined(CONFIG_ARCH_DAVINCI_DA8XX) -#define PHYS_OFFSET DA8XX_DDR_BASE +#define PLAT_PHYS_OFFSET DA8XX_DDR_BASE #else -#define PHYS_OFFSET DAVINCI_DDR_BASE +#define PLAT_PHYS_OFFSET DAVINCI_DDR_BASE #endif #define DDR2_SDRCR_OFFSET 0xc |