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 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c2400
/
include
/
mach
/
memory.h
diff --git
a/arch/arm/mach-s3c2400/include/mach/memory.h
b/arch/arm/mach-s3c2400/include/mach/memory.h
index
cf5901f
..
3f33670
100644
(file)
--- a/
arch/arm/mach-s3c2400/include/mach/memory.h
+++ b/
arch/arm/mach-s3c2400/include/mach/memory.h
@@
-15,6
+15,6
@@
#ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H
-#define P
HYS_OFFSET
UL(0x0C000000)
+#define P
LAT_PHYS_OFFSET
UL(0x0C000000)
#endif