projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'for-3.19/hid-report-len', 'for-3.19/i2c-hid', 'for-3.19/lenovo',...
[linux-2.6-microblaze.git]
/
arch
/
arc
/
include
/
asm
/
string.h
diff --git
a/arch/arc/include/asm/string.h
b/arch/arc/include/asm/string.h
index
87676c8
..
95822b5
100644
(file)
--- a/
arch/arc/include/asm/string.h
+++ b/
arch/arc/include/asm/string.h
@@
-17,8
+17,6
@@
#include <linux/types.h>
#include <linux/types.h>
-#ifdef __KERNEL__
-
#define __HAVE_ARCH_MEMSET
#define __HAVE_ARCH_MEMCPY
#define __HAVE_ARCH_MEMCMP
#define __HAVE_ARCH_MEMSET
#define __HAVE_ARCH_MEMCPY
#define __HAVE_ARCH_MEMCMP
@@
-36,5
+34,4
@@
extern char *strcpy(char *dest, const char *src);
extern int strcmp(const char *cs, const char *ct);
extern __kernel_size_t strlen(const char *);
extern int strcmp(const char *cs, const char *ct);
extern __kernel_size_t strlen(const char *);
-#endif /* __KERNEL__ */
#endif /* _ASM_ARC_STRING_H */
#endif /* _ASM_ARC_STRING_H */