diff options
author | Ingo Molnar | 2008-07-31 18:43:41 +0200 |
---|---|---|
committer | Ingo Molnar | 2008-07-31 18:43:41 +0200 |
commit | 85e9ca333d03fbd56b9e123c8456f0d98e20faad (patch) | |
tree | 7bb15ada5f536950efa23ad60ea9eea60380ca1c /include/asm-cris/cacheflush.h | |
parent | documentation: move hpet.txt to timers/ subdirectory (diff) | |
parent | Linux 2.6.27-rc1 (diff) | |
download | kernel-qcow2-linux-85e9ca333d03fbd56b9e123c8456f0d98e20faad.tar.gz kernel-qcow2-linux-85e9ca333d03fbd56b9e123c8456f0d98e20faad.tar.xz kernel-qcow2-linux-85e9ca333d03fbd56b9e123c8456f0d98e20faad.zip |
Merge branch 'linus' into timers/hpet
Diffstat (limited to 'include/asm-cris/cacheflush.h')
-rw-r--r-- | include/asm-cris/cacheflush.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-cris/cacheflush.h b/include/asm-cris/cacheflush.h index 01af2de27c5b..cf60e3f69f8d 100644 --- a/include/asm-cris/cacheflush.h +++ b/include/asm-cris/cacheflush.h @@ -26,7 +26,6 @@ #define copy_from_user_page(vma, page, vaddr, dst, src, len) \ memcpy(dst, src, len) -void global_flush_tlb(void); int change_page_attr(struct page *page, int numpages, pgprot_t prot); #endif /* _CRIS_CACHEFLUSH_H */ |