diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-13 05:50:07 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-13 05:50:26 +0000 |
| commit | ffafe770a4160862476405a442d28ee48d2249ef (patch) | |
| tree | 5bb7d5913427c245c61dd5eb384321dff386f841 /arch/xtensa/include/asm/string.h | |
| parent | 0dcd627896fb87b2e78a1ed78e469591208cffcd (diff) | |
| parent | da911782be4c82dc1222aa0cb5bef28605d1e117 (diff) | |
| download | talos-op-linux-ffafe770a4160862476405a442d28ee48d2249ef.tar.gz talos-op-linux-ffafe770a4160862476405a442d28ee48d2249ef.zip | |
Merge branch 'v3.3-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
* 'v3.3-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (2 commits)
ARM: EXYNOS: Add cpu-offset property in gic device tree node
ARM: EXYNOS: Bring exynos4-dt up to date
Linux 3.3-rc3
This includes an update to the v3.3-rc3 release from v3.3-rc2
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/xtensa/include/asm/string.h')
| -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 */ |
