diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 14:49:01 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 14:49:01 +0000 |
| commit | e856359685143a2f65876e7db4e4aa0ef5dce7f0 (patch) | |
| tree | bbcafe7f23975979f7a2bc6fd1404908d5fd7bd1 /include/asm-cris/string.h | |
| parent | e3bd9ec5d8bfc90f9e1bd995677829e57a404061 (diff) | |
| parent | 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c-moves2
Diffstat (limited to 'include/asm-cris/string.h')
| -rw-r--r-- | include/asm-cris/string.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/include/asm-cris/string.h b/include/asm-cris/string.h deleted file mode 100644 index 691190e99a27..000000000000 --- a/include/asm-cris/string.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef _ASM_CRIS_STRING_H -#define _ASM_CRIS_STRING_H - -/* the optimized memcpy is in arch/cris/lib/string.c */ - -#define __HAVE_ARCH_MEMCPY -extern void *memcpy(void *, const void *, size_t); - -/* New and improved. In arch/cris/lib/memset.c */ - -#define __HAVE_ARCH_MEMSET -extern void *memset(void *, int, size_t); - -#endif |