diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
| commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
| tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /include/asm-m32r/setup.h | |
| parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'include/asm-m32r/setup.h')
| -rw-r--r-- | include/asm-m32r/setup.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-m32r/setup.h b/include/asm-m32r/setup.h index 5f028dc26a9b..52f4fa29abfc 100644 --- a/include/asm-m32r/setup.h +++ b/include/asm-m32r/setup.h | |||
| @@ -24,10 +24,6 @@ | |||
| 24 | #define RAMDISK_PROMPT_FLAG (0x8000) | 24 | #define RAMDISK_PROMPT_FLAG (0x8000) |
| 25 | #define RAMDISK_LOAD_FLAG (0x4000) | 25 | #define RAMDISK_LOAD_FLAG (0x4000) |
| 26 | 26 | ||
| 27 | #define PFN_UP(x) (((x) + PAGE_SIZE-1) >> PAGE_SHIFT) | ||
| 28 | #define PFN_DOWN(x) ((x) >> PAGE_SHIFT) | ||
| 29 | #define PFN_PHYS(x) ((x) << PAGE_SHIFT) | ||
| 30 | |||
| 31 | extern unsigned long memory_start; | 27 | extern unsigned long memory_start; |
| 32 | extern unsigned long memory_end; | 28 | extern unsigned long memory_end; |
| 33 | 29 | ||