projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[linux-2.6-block.git]
/
arch
/
arm
/
include
/
asm
/
mmzone.h
diff --git
a/arch/arm/include/asm/mmzone.h
b/arch/arm/include/asm/mmzone.h
index f2fbb508490160a212be0a1252e5deffeb64aceb..ae63a4fd28c83c8c7786b32550220cf6ad9f83f1 100644
(file)
--- a/
arch/arm/include/asm/mmzone.h
+++ b/
arch/arm/include/asm/mmzone.h
@@
-25,6
+25,6
@@
extern pg_data_t discontig_node_data[];
*/
#define NODE_MEM_MAP(nid) (NODE_DATA(nid)->node_mem_map)
-#include <
asm/ar
ch/memory.h>
+#include <
ma
ch/memory.h>
#endif