diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-01 19:51:51 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-01 19:51:51 +0300 |
commit | 0242909a6135e10a28822c64f9ad50fdad52757c (patch) | |
tree | c5f9c8abe95a65433e6ac356871f2379c02488fe /include/asm-cris/arch-v32/intmem.h | |
parent | 0a6d2fac615972142715d736289abeeb7382e81d (diff) | |
parent | 556dcee7b829e5c350c3ffdbdb87a8b15aa3c5d3 (diff) | |
download | linux-0242909a6135e10a28822c64f9ad50fdad52757c.tar.xz |
Merge branch 'cris_move' of git://www.jni.nu/cris
* 'cris_move' of git://www.jni.nu/cris:
[CRIS] Move header files from include to arch/cris/include.
[CRISv32] Remove warning in io.h
Diffstat (limited to 'include/asm-cris/arch-v32/intmem.h')
-rw-r--r-- | include/asm-cris/arch-v32/intmem.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/asm-cris/arch-v32/intmem.h b/include/asm-cris/arch-v32/intmem.h deleted file mode 100644 index c0ada33bf90f..000000000000 --- a/include/asm-cris/arch-v32/intmem.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _ASM_CRIS_INTMEM_H -#define _ASM_CRIS_INTMEM_H - -void* crisv32_intmem_alloc(unsigned size, unsigned align); -void crisv32_intmem_free(void* addr); -void* crisv32_intmem_phys_to_virt(unsigned long addr); -unsigned long crisv32_intmem_virt_to_phys(void *addr); - -#endif /* _ASM_CRIS_ARCH_INTMEM_H */ |