diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 15:38:48 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 15:38:48 +0200 |
commit | bda307ed7bdc160fcf1475a49f6c2e796fcb1294 (patch) | |
tree | aa24926a83001373cb4ac2d8be9fd1b6994e7c60 /include/asm-frv/page.h | |
parent | 0791e13fbb1ea4e1808d055922c3f116b924bdc9 (diff) | |
parent | 024e8ac04453b3525448c31ef39848cf675ba6db (diff) |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'include/asm-frv/page.h')
-rw-r--r-- | include/asm-frv/page.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-frv/page.h b/include/asm-frv/page.h index c2c1e89e747..bd9c220094c 100644 --- a/include/asm-frv/page.h +++ b/include/asm-frv/page.h @@ -40,9 +40,6 @@ typedef struct page *pgtable_t; #define __pgprot(x) ((pgprot_t) { (x) } ) #define PTE_MASK PAGE_MASK -/* to align the pointer to the (next) page boundary */ -#define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK) - #define devmem_is_allowed(pfn) 1 #define __pa(vaddr) virt_to_phys((void *) (unsigned long) (vaddr)) |