diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-16 10:39:24 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-16 10:39:24 -0700 |
commit | 03e6b495ccbdd14282ce0dd0753481d4f4f0bab1 (patch) | |
tree | a65ee370535e4af347b8e5c1f2bf32185f7f2763 /include/asm-arm/arch-aaec2000/memory.h | |
parent | bc9a5154a24d16d41cc79dbf1442de34454bc7db (diff) | |
parent | 1b3cb73f7306f97a68fa973dec9f3c3b68bd29cf (diff) | |
download | op-kernel-dev-03e6b495ccbdd14282ce0dd0753481d4f4f0bab1.zip op-kernel-dev-03e6b495ccbdd14282ce0dd0753481d4f4f0bab1.tar.gz |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include/asm-arm/arch-aaec2000/memory.h')
-rw-r--r-- | include/asm-arm/arch-aaec2000/memory.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-arm/arch-aaec2000/memory.h b/include/asm-arm/arch-aaec2000/memory.h index 681b6a6..79c9081 100644 --- a/include/asm-arm/arch-aaec2000/memory.h +++ b/include/asm-arm/arch-aaec2000/memory.h @@ -64,10 +64,6 @@ #define NODE_MAX_MEM_SHIFT 26 #define NODE_MAX_MEM_SIZE (1 << NODE_MAX_MEM_SHIFT) -#else - -#define PFN_TO_NID(addr) (0) - #endif /* CONFIG_DISCONTIGMEM */ #endif /* __ASM_ARCH_MEMORY_H */ |