git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
include
/
asm-arm
/
arch-pxa
/
memory.h
diff --git
a/include/asm-arm/arch-pxa/memory.h
b/include/asm-arm/arch-pxa/memory.h
index
217a80b
..
eaf6d43
100644
(file)
--- a/
include/asm-arm/arch-pxa/memory.h
+++ b/
include/asm-arm/arch-pxa/memory.h
@@
-15,7
+15,7
@@
/*
* Physical DRAM offset.
*/
/*
* Physical DRAM offset.
*/
-#define PHYS_OFFSET
(0xa0000000UL
)
+#define PHYS_OFFSET
UL(0xa0000000
)
/*
* Virtual view <-> DMA view memory address translations
/*
* Virtual view <-> DMA view memory address translations
@@
-67,10
+67,6
@@
#define LOCAL_MAP_NR(addr) \
(((unsigned long)(addr) & 0x03ffffff) >> PAGE_SHIFT)
#define LOCAL_MAP_NR(addr) \
(((unsigned long)(addr) & 0x03ffffff) >> PAGE_SHIFT)
-#else
-
-#define PFN_TO_NID(addr) (0)
-
#endif
#endif
#endif
#endif