diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-09-19 04:47:49 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-09-19 04:47:49 -0400 |
| commit | 044a500e46742d39d22f1781cfb64ba93b463e39 (patch) | |
| tree | b0313211ea7ba26b90c1083ade0e4c9f486b87db /include/asm-arm/arch-sa1100/memory.h | |
| parent | f6098cf449b81c14a51e48dd22ae47d03126a1de (diff) | |
| parent | 6c0741fbdee5bd0f8ed13ac287c4ab18e8ba7d83 (diff) | |
Merge branch 'master' of /home/src/linux-2.6/
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) | |||
| 99 | #define LOCAL_MAP_NR(addr) \ | 99 | #define LOCAL_MAP_NR(addr) \ |
| 100 | (((unsigned long)(addr) & 0x07ffffff) >> PAGE_SHIFT) | 100 | (((unsigned long)(addr) & 0x07ffffff) >> PAGE_SHIFT) |
| 101 | 101 | ||
| 102 | #else | ||
| 103 | |||
| 104 | #define PFN_TO_NID(addr) (0) | ||
| 105 | |||
| 106 | #endif | 102 | #endif |
| 107 | 103 | ||
| 108 | #endif | 104 | #endif |