diff options
| author | David Brown <[email protected]> | 2011-01-26 13:29:22 -0800 |
|---|---|---|
| committer | David Brown <[email protected]> | 2011-01-26 13:29:22 -0800 |
| commit | 851492c6585ac10367df7880fb0001f529fa8d5c (patch) | |
| tree | bedf5360cab2314e0d9e13be7cff386841695bb3 /arch/arm/mach-msm/include/mach/memory.h | |
| parent | ba5499ebfb7bc7859039d782099c75d92c394016 (diff) | |
| parent | 50ede4e39aa5b61685ca87f58422478b1a538ca8 (diff) | |
Merge branch 'msm-8960' into msm-core
* msm-8960:
msm: Support for the MSM8960 RUMI3 target
msm: Support for the MSM8960 Simulator target
msm: Makefile cleanup
msm: timer: Timer support for MSM8960
msm: Add MSM 8960 cpu_is check
msm: irqs-8960: Interrupt map for MSM8960
msm: Physical offset for MSM8960
msm: io: I/O register definitions for MSM8960
msm: Generalize QGIC registers
msm: Generalize timer register mappings
msm: Add CPU queries
Diffstat (limited to 'arch/arm/mach-msm/include/mach/memory.h')
| -rw-r--r-- | arch/arm/mach-msm/include/mach/memory.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-msm/include/mach/memory.h b/arch/arm/mach-msm/include/mach/memory.h index 070e17d237f1..014bbd3ac1d4 100644 --- a/arch/arm/mach-msm/include/mach/memory.h +++ b/arch/arm/mach-msm/include/mach/memory.h @@ -25,6 +25,8 @@ #define PHYS_OFFSET UL(0x00200000) #elif defined(CONFIG_ARCH_MSM8X60) #define PHYS_OFFSET UL(0x40200000) +#elif defined(CONFIG_ARCH_MSM8960) +#define PHYS_OFFSET UL(0x40200000) #else #define PHYS_OFFSET UL(0x10000000) #endif |