diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-14 17:13:25 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-14 17:13:25 +0400 |
| commit | 7d9aca39dcacd2b3f42e2e287162329f410f93e1 (patch) | |
| tree | 2907b680b2b7625226f46d23d74ccc9c58ad0362 /arch/xtensa/include/asm/string.h | |
| parent | e1c1c69c8fc7656c33460c8e085ac0d0be22ac3b (diff) | |
| parent | a0cc0209abb9fe2b9ab71aa41be70eddd0cbdd61 (diff) | |
| download | linux-7d9aca39dcacd2b3f42e2e287162329f410f93e1.tar.xz | |
Merge remote-tracking branch 'regmap/topic/drivers' into regmap-next
Resolved simple add/add conflicts:
drivers/base/regmap/internal.h
drivers/base/regmap/regmap.c
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 */ |