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 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
arch
/
arm
/
mach-vexpress
/
include
/
mach
/
memory.h
diff --git
a/arch/arm/mach-vexpress/include/mach/memory.h
b/arch/arm/mach-vexpress/include/mach/memory.h
index
be28232
..
5b7fcd4
100644
(file)
--- a/
arch/arm/mach-vexpress/include/mach/memory.h
+++ b/
arch/arm/mach-vexpress/include/mach/memory.h
@@
-20,6
+20,6
@@
#ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H
-#define P
HYS_OFFSET
UL(0x60000000)
+#define P
LAT_PHYS_OFFSET
UL(0x60000000)
#endif