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 v2.6.37-rc8 into powerpc/next
[pandora-kernel.git]
/
arch
/
arm
/
plat-omap
/
include
/
plat
/
memory.h
diff --git
a/arch/arm/plat-omap/include/plat/memory.h
b/arch/arm/plat-omap/include/plat/memory.h
index
3325f7b
..
d5306be
100644
(file)
--- a/
arch/arm/plat-omap/include/plat/memory.h
+++ b/
arch/arm/plat-omap/include/plat/memory.h
@@
-38,8
+38,7
@@
*/
#if defined(CONFIG_ARCH_OMAP1)
#define PHYS_OFFSET UL(0x10000000)
-#elif defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \
- defined(CONFIG_ARCH_OMAP4)
+#else
#define PHYS_OFFSET UL(0x80000000)
#endif