diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:43:41 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:43:41 -0400 |
| commit | 85e9ca333d03fbd56b9e123c8456f0d98e20faad (patch) | |
| tree | 7bb15ada5f536950efa23ad60ea9eea60380ca1c /include/asm-mn10300/page.h | |
| parent | a300bec952127d9a15e666b391bb35c9aecb3002 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge branch 'linus' into timers/hpet
Diffstat (limited to 'include/asm-mn10300/page.h')
| -rw-r--r-- | include/asm-mn10300/page.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-mn10300/page.h b/include/asm-mn10300/page.h index 124971b9fb9b..8288e124165b 100644 --- a/include/asm-mn10300/page.h +++ b/include/asm-mn10300/page.h | |||
| @@ -61,9 +61,6 @@ typedef struct page *pgtable_t; | |||
| 61 | 61 | ||
| 62 | #endif /* !__ASSEMBLY__ */ | 62 | #endif /* !__ASSEMBLY__ */ |
| 63 | 63 | ||
| 64 | /* to align the pointer to the (next) page boundary */ | ||
| 65 | #define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK) | ||
| 66 | |||
| 67 | /* | 64 | /* |
| 68 | * This handles the memory map.. We could make this a config | 65 | * This handles the memory map.. We could make this a config |
| 69 | * option, but too many people screw it up, and too few need | 66 | * option, but too many people screw it up, and too few need |