diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-02-24 08:23:23 +0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-02-24 08:23:23 +0400 |
| commit | 35eb304b5cd7b49d581bda79218b8134f3b689ea (patch) | |
| tree | 3d75d9ada70814161d035b2f9166fee05d257dfb /arch/xtensa/include | |
| parent | ca0cc30109241f280eb871794620d7cf198bb582 (diff) | |
| parent | bb4c7e9a9908548b458f34afb2fee74dc0d49f90 (diff) | |
| download | linux-35eb304b5cd7b49d581bda79218b8134f3b689ea.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-fixes-for-linus
Diffstat (limited to 'arch/xtensa/include')
| -rw-r--r-- | arch/xtensa/include/asm/string.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/xtensa/include/asm/string.h b/arch/xtensa/include/asm/string.h index 5fb8c27cbef5..405a8c49ff2c 100644 --- a/arch/xtensa/include/asm/string.h +++ b/arch/xtensa/include/asm/string.h @@ -118,7 +118,4 @@ extern void *memmove(void *__dest, __const__ void *__src, size_t __n); /* Don't build bcopy at all ... */ #define __HAVE_ARCH_BCOPY -#define __HAVE_ARCH_MEMSCAN -#define memscan memchr - #endif /* _XTENSA_STRING_H */ |