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 git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into fixes
[pandora-kernel.git]
/
arch
/
arm
/
mach-sa1100
/
include
/
mach
/
memory.h
diff --git
a/arch/arm/mach-sa1100/include/mach/memory.h
b/arch/arm/mach-sa1100/include/mach/memory.h
index
128a1df
..
a44da6a
100644
(file)
--- a/
arch/arm/mach-sa1100/include/mach/memory.h
+++ b/
arch/arm/mach-sa1100/include/mach/memory.h
@@
-12,7
+12,7
@@
/*
* Physical DRAM offset is 0xc0000000 on the SA1100
*/
/*
* Physical DRAM offset is 0xc0000000 on the SA1100
*/
-#define P
HYS_OFFSET
UL(0xc0000000)
+#define P
LAT_PHYS_OFFSET
UL(0xc0000000)
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLY__