From: Adrian Bunk <bunk@stusta.de>

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/include/asm-i386/string.h |    3 ---
 25-akpm/lib/string.c              |    2 --
 2 files changed, 5 deletions(-)

diff -puN include/asm-i386/string.h~remove-in_string_c include/asm-i386/string.h
--- 25/include/asm-i386/string.h~remove-in_string_c	Thu Dec 16 14:31:23 2004
+++ 25-akpm/include/asm-i386/string.h	Thu Dec 16 14:31:23 2004
@@ -25,7 +25,6 @@
 
 /* AK: in fact I bet it would be better to move this stuff all out of line.
  */
-#if !defined(IN_STRING_C)
 
 #define __HAVE_ARCH_STRCPY
 static inline char * strcpy(char * dest,const char *src)
@@ -180,8 +179,6 @@ __asm__ __volatile__(
 return __res;
 }
 
-#endif
-
 #define __HAVE_ARCH_STRLEN
 static inline size_t strlen(const char * s)
 {
diff -puN lib/string.c~remove-in_string_c lib/string.c
--- 25/lib/string.c~remove-in_string_c	Thu Dec 16 14:31:23 2004
+++ 25-akpm/lib/string.c	Thu Dec 16 14:31:23 2004
@@ -19,8 +19,6 @@
  * -  Kissed strtok() goodbye
  */
 
-#define IN_STRING_C 1
- 
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/ctype.h>
_