diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 18:07:55 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 18:07:55 -0400 |
| commit | cb28a1bbdb4790378e7366d6c9ee1d2340b84f92 (patch) | |
| tree | 316436f77dac75335fd2c3ef5f109e71606c50d3 /include/asm-mn10300/page.h | |
| parent | b6d4f7e3ef25beb8c658c97867d98883e69dc544 (diff) | |
| parent | f934fb19ef34730263e6afc01e8ec27a8a71470f (diff) | |
Merge branch 'linus' into core/generic-dma-coherent
Conflicts:
arch/x86/Kconfig
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 |