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/sage/ceph-client
[pandora-kernel.git]
/
arch
/
arm
/
mach-cns3xxx
/
include
/
mach
/
memory.h
diff --git
a/arch/arm/mach-cns3xxx/include/mach/memory.h
b/arch/arm/mach-cns3xxx/include/mach/memory.h
index
3b6b769
..
dc16c5c
100644
(file)
--- a/
arch/arm/mach-cns3xxx/include/mach/memory.h
+++ b/
arch/arm/mach-cns3xxx/include/mach/memory.h
@@
-13,7
+13,7
@@
/*
* Physical DRAM offset.
*/
-#define P
HYS_OFFSET
UL(0x00000000)
+#define P
LAT_PHYS_OFFSET
UL(0x00000000)
#define __phys_to_bus(x) ((x) + PHYS_OFFSET)
#define __bus_to_phys(x) ((x) - PHYS_OFFSET)