diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-16 19:35:27 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-16 19:35:27 -0400 |
| commit | 05e34754518b6a90d5c392790c032575fab12d66 (patch) | |
| tree | 318d321262269eff585573ab2acf04a2ff2b65f4 /arch/arm/mach-davinci/include/mach | |
| parent | bd1274dc005c2cee41771a7cc616f4709a6e6323 (diff) | |
| parent | b511d75d6150892e67c8ebfa9dc8eb37ebd02aa3 (diff) | |
Merge branch 'p2v' into devel
Conflicts:
arch/arm/kernel/module.c
arch/arm/mach-s5pv210/sleep.S
Diffstat (limited to 'arch/arm/mach-davinci/include/mach')
| -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 22eb97c1c30b..78822723f382 100644 --- a/arch/arm/mach-davinci/include/mach/memory.h +++ b/arch/arm/mach-davinci/include/mach/memory.h | |||
| @@ -26,9 +26,9 @@ | |||
| 26 | #if defined(CONFIG_ARCH_DAVINCI_DA8XX) && defined(CONFIG_ARCH_DAVINCI_DMx) | 26 | #if defined(CONFIG_ARCH_DAVINCI_DA8XX) && defined(CONFIG_ARCH_DAVINCI_DMx) |
| 27 | #error Cannot enable DaVinci and DA8XX platforms concurrently | 27 | #error Cannot enable DaVinci and DA8XX platforms concurrently |
| 28 | #elif defined(CONFIG_ARCH_DAVINCI_DA8XX) | 28 | #elif defined(CONFIG_ARCH_DAVINCI_DA8XX) |
| 29 | #define PHYS_OFFSET DA8XX_DDR_BASE | 29 | #define PLAT_PHYS_OFFSET DA8XX_DDR_BASE |
| 30 | #else | 30 | #else |
| 31 | #define PHYS_OFFSET DAVINCI_DDR_BASE | 31 | #define PLAT_PHYS_OFFSET DAVINCI_DDR_BASE |
| 32 | #endif | 32 | #endif |
| 33 | 33 | ||
| 34 | #define DDR2_SDRCR_OFFSET 0xc | 34 | #define DDR2_SDRCR_OFFSET 0xc |