projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-3.5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
s390
/
include
/
asm
/
string.h
diff --git
a/arch/s390/include/asm/string.h
b/arch/s390/include/asm/string.h
index cd0241db5a4688b754d6838497cfc06768b4025e..8cc160c9e1cb108c2ce9829dc4c5684a34a3b4ae 100644
(file)
--- a/
arch/s390/include/asm/string.h
+++ b/
arch/s390/include/asm/string.h
@@
-9,8
+9,6
@@
#ifndef _S390_STRING_H_
#define _S390_STRING_H_
#ifndef _S390_STRING_H_
#define _S390_STRING_H_
-#ifdef __KERNEL__
-
#ifndef _LINUX_TYPES_H
#include <linux/types.h>
#endif
#ifndef _LINUX_TYPES_H
#include <linux/types.h>
#endif
@@
-152,6
+150,4
@@
size_t strlen(const char *s);
size_t strnlen(const char * s, size_t n);
#endif /* !IN_ARCH_STRING_C */
size_t strnlen(const char * s, size_t n);
#endif /* !IN_ARCH_STRING_C */
-#endif /* __KERNEL__ */
-
#endif /* __S390_STRING_H_ */
#endif /* __S390_STRING_H_ */