diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 17:25:57 +0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 17:25:57 +0200 |
commit | 50cb993ea6cd187bfed085cb3e0747066edeb02f (patch) | |
tree | 61edac62c6c5bc07c59e4369c50c6821ad77f2c0 /include/asm-cris/page.h | |
parent | V4L/DVB (8534): remove select's of FW_LOADER (diff) | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol... (diff) | |
download | linux-50cb993ea6cd187bfed085cb3e0747066edeb02f.tar.xz linux-50cb993ea6cd187bfed085cb3e0747066edeb02f.zip |
Merge ../linux-2.6
Diffstat (limited to 'include/asm-cris/page.h')
-rw-r--r-- | include/asm-cris/page.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-cris/page.h b/include/asm-cris/page.h index c45bb1ef397c..d19272ba6b69 100644 --- a/include/asm-cris/page.h +++ b/include/asm-cris/page.h @@ -60,9 +60,6 @@ typedef struct page *pgtable_t; #define page_to_phys(page) __pa((((page) - mem_map) << PAGE_SHIFT) + PAGE_OFFSET) -/* to align the pointer to the (next) page boundary */ -#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) - #ifndef __ASSEMBLY__ #endif /* __ASSEMBLY__ */ |