projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.denx.de/u-boot-fsl-qoriq
[oweals/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
string.h
diff --git
a/arch/arm/include/asm/string.h
b/arch/arm/include/asm/string.h
index c6dfb254b5e4c61692215467b0da414d5bc81ce0..11eaa34fab8cf2ed75ba056408a58f774bbaf492 100644
(file)
--- a/
arch/arm/include/asm/string.h
+++ b/
arch/arm/include/asm/string.h
@@
-14,7
+14,7
@@
extern char * strrchr(const char * s, int c);
#undef __HAVE_ARCH_STRCHR
extern char * strchr(const char * s, int c);
#undef __HAVE_ARCH_STRCHR
extern char * strchr(const char * s, int c);
-#if
def CONFIG_USE_ARCH_MEMCPY
+#if
CONFIG_IS_ENABLED(USE_ARCH_MEMCPY)
#define __HAVE_ARCH_MEMCPY
#endif
extern void * memcpy(void *, const void *, __kernel_size_t);
#define __HAVE_ARCH_MEMCPY
#endif
extern void * memcpy(void *, const void *, __kernel_size_t);
@@
-26,7
+26,7
@@
extern void * memmove(void *, const void *, __kernel_size_t);
extern void * memchr(const void *, int, __kernel_size_t);
#undef __HAVE_ARCH_MEMZERO
extern void * memchr(const void *, int, __kernel_size_t);
#undef __HAVE_ARCH_MEMZERO
-#if
def CONFIG_USE_ARCH_MEMSET
+#if
CONFIG_IS_ENABLED(USE_ARCH_MEMSET)
#define __HAVE_ARCH_MEMSET
#endif
extern void * memset(void *, int, __kernel_size_t);
#define __HAVE_ARCH_MEMSET
#endif
extern void * memset(void *, int, __kernel_size_t);