git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'msm-core' of git://codeaurora.org/quic/kernel/dwalker/linux-msm into...
[pandora-kernel.git]
/
arch
/
arm
/
mach-msm
/
include
/
mach
/
memory.h
diff --git
a/arch/arm/mach-msm/include/mach/memory.h
b/arch/arm/mach-msm/include/mach/memory.h
index
50c7847
..
070e17d
100644
(file)
--- a/
arch/arm/mach-msm/include/mach/memory.h
+++ b/
arch/arm/mach-msm/include/mach/memory.h
@@
-23,6
+23,8
@@
#define PHYS_OFFSET UL(0x20000000)
#elif defined(CONFIG_ARCH_MSM7X30)
#define PHYS_OFFSET UL(0x00200000)
+#elif defined(CONFIG_ARCH_MSM8X60)
+#define PHYS_OFFSET UL(0x40200000)
#else
#define PHYS_OFFSET UL(0x10000000)
#endif