fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / s390 / lib / string.c

diff --git a/arch/s390/lib/string.c b/arch/s390/lib/string.c
index 9cf22aa..ae5cf5d 100644 (file)
--- a/arch/s390/lib/string.c
+++ b/arch/s390/lib/string.c
@@ -233,7 +233,7 @@ char * strrchr(const char * s, int c)
                       if (s[len] == (char) c)
                               return (char *) s + len;
               } while (--len > 0);
-       return 0;
+       return NULL;
 }
 EXPORT_SYMBOL(strrchr);
 
@@ -267,7 +267,7 @@ char * strstr(const char * s1,const char * s2)
                        return (char *) s1;
                s1++;
        }
-       return 0;
+       return NULL;
 }
 EXPORT_SYMBOL(strstr);
 
@@ -356,21 +356,6 @@ void *memcpy(void *dest, const void *src, size_t n)
 }
 EXPORT_SYMBOL(memcpy);
 
-/**
- * bcopy - Copy one area of memory to another
- * @src: Where to copy from
- * @dest: Where to copy to
- * @n: The size of the area.
- *
- * Note that this is the same as memcpy(), with the arguments reversed.
- * memcpy() is the standard, bcopy() is a legacy BSD function.
- */
-void bcopy(const void *srcp, void *destp, size_t n)
-{
-       __builtin_memcpy(destp, srcp, n);
-}
-EXPORT_SYMBOL(bcopy);
-
 /**
  * memset - Fill a region of memory with the given value
  * @s: Pointer to the start of the area.