ppc64: user strcase.c from powerpc/lib
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 27 Oct 2005 07:12:52 +0000 (17:12 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Oct 2005 02:54:18 +0000 (12:54 +1000)
since it is identical to strcase.c from ppc64/lib.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
arch/powerpc/lib/Makefile
arch/ppc64/lib/Makefile
arch/ppc64/lib/strcase.c [deleted file]

index a7af96ce9df2ca61b99c015742af716995fe72ec..0726235ef25da8293677065a0f3eb776dc22938e 100644 (file)
@@ -3,11 +3,12 @@
 #
 
 ifeq ($(CONFIG_PPC_MERGE),y)
-obj-y                  := strcase.o string.o
-obj-$(CONFIG_PPC32)    += div64.o copy_32.o checksum_32.o
+obj-y                  := string.o
 obj-$(CONFIG_PPC64)    += usercopy_64.o mem_64.o
 endif
 
+obj-y                  += strcase.o
+obj-$(CONFIG_PPC32)    += div64.o copy_32.o checksum_32.o
 obj-$(CONFIG_PPC64)    += checksum_64.o copypage_64.o copyuser_64.o \
                           memcpy_64.o
 obj-$(CONFIG_PPC_ISERIES) += e2a.o
index e8ce831d8eaee2d207963eb241eafedb4c85f724..f4732c5ffd5f360ce3efc8d747605c79d0f6c6b8 100644 (file)
@@ -2,5 +2,5 @@
 # Makefile for ppc64-specific library files..
 #
 
-lib-y := string.o strcase.o
+lib-y := string.o
 lib-y += usercopy.o
diff --git a/arch/ppc64/lib/strcase.c b/arch/ppc64/lib/strcase.c
deleted file mode 100644 (file)
index e84f243..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * c 2001 PPC 64 Team, IBM Corp
- *
- *      This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License
- *      as published by the Free Software Foundation; either version
- *      2 of the License, or (at your option) any later version.
- */
-#include <linux/ctype.h>
-
-int strcasecmp(const char *s1, const char *s2)
-{
-       int c1, c2;
-
-       do {
-               c1 = tolower(*s1++);
-               c2 = tolower(*s2++);
-       } while (c1 == c2 && c1 != 0);
-       return c1 - c2;
-}
-
-int strncasecmp(const char *s1, const char *s2, int n)
-{
-       int c1, c2;
-
-       do {
-               c1 = tolower(*s1++);
-               c2 = tolower(*s2++);
-       } while ((--n > 0) && c1 == c2 && c1 != 0);
-       return c1 - c2;
-}