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 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git...
[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
176875d
..
f2f8d29
100644
(file)
--- a/
arch/arm/mach-msm/include/mach/memory.h
+++ b/
arch/arm/mach-msm/include/mach/memory.h
@@
-25,6
+25,8
@@
#define PLAT_PHYS_OFFSET UL(0x00200000)
#elif defined(CONFIG_ARCH_MSM8X60)
#define PLAT_PHYS_OFFSET UL(0x40200000)
+#elif defined(CONFIG_ARCH_MSM8960)
+#define PLAT_PHYS_OFFSET UL(0x40200000)
#else
#define PLAT_PHYS_OFFSET UL(0x10000000)
#endif