diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-16 21:39:24 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-16 21:39:24 +0400 |
| commit | 03e6b495ccbdd14282ce0dd0753481d4f4f0bab1 (patch) | |
| tree | a65ee370535e4af347b8e5c1f2bf32185f7f2763 /include/asm-arm/arch-sa1100/memory.h | |
| parent | bc9a5154a24d16d41cc79dbf1442de34454bc7db (diff) | |
| parent | 1b3cb73f7306f97a68fa973dec9f3c3b68bd29cf (diff) | |
| download | linux-03e6b495ccbdd14282ce0dd0753481d4f4f0bab1.tar.xz | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include/asm-arm/arch-sa1100/memory.h')
| -rw-r--r-- | include/asm-arm/arch-sa1100/memory.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-arm/arch-sa1100/memory.h b/include/asm-arm/arch-sa1100/memory.h index 32d3d5bde34d..8743ff5c1b23 100644 --- a/include/asm-arm/arch-sa1100/memory.h +++ b/include/asm-arm/arch-sa1100/memory.h @@ -99,10 +99,6 @@ __arch_adjust_zones(int node, unsigned long *size, unsigned long *holes) #define LOCAL_MAP_NR(addr) \ (((unsigned long)(addr) & 0x07ffffff) >> PAGE_SHIFT) -#else - -#define PFN_TO_NID(addr) (0) - #endif #endif |