diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-08-29 19:29:00 (GMT) |
---|---|---|
committer | Nicolas Pitre <nico@fluxnic.net> | 2011-08-29 19:29:00 (GMT) |
commit | 96f90c791512bf8ceb50572a0e65d4cabb665c60 (patch) | |
tree | 33ed5d6e4ce2ef005a43b0a5e2b9a70e3866d7f4 /arch/arm/mach-msm/include/mach/memory.h | |
parent | ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893 (diff) | |
parent | daece59689e76ed55d8863cae04993679a8e844e (diff) | |
download | linux-fsl-qoriq-96f90c791512bf8ceb50572a0e65d4cabb665c60.tar.xz |
Merge the enabling by default of ARM_PATCH_PHYS_VIRT
Conflicts:
arch/arm/mach-msm/board-msm7x30.c
Diffstat (limited to 'arch/arm/mach-msm/include/mach/memory.h')
-rw-r--r-- | arch/arm/mach-msm/include/mach/memory.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-msm/include/mach/memory.h b/arch/arm/mach-msm/include/mach/memory.h index f2f8d29..58d5e7e 100644 --- a/arch/arm/mach-msm/include/mach/memory.h +++ b/arch/arm/mach-msm/include/mach/memory.h @@ -22,11 +22,11 @@ #elif defined(CONFIG_ARCH_QSD8X50) #define PLAT_PHYS_OFFSET UL(0x20000000) #elif defined(CONFIG_ARCH_MSM7X30) -#define PLAT_PHYS_OFFSET UL(0x00200000) +#define PLAT_PHYS_OFFSET UL(0x00000000) #elif defined(CONFIG_ARCH_MSM8X60) -#define PLAT_PHYS_OFFSET UL(0x40200000) +#define PLAT_PHYS_OFFSET UL(0x40000000) #elif defined(CONFIG_ARCH_MSM8960) -#define PLAT_PHYS_OFFSET UL(0x40200000) +#define PLAT_PHYS_OFFSET UL(0x40000000) #else #define PLAT_PHYS_OFFSET UL(0x10000000) #endif |