From 9e1e04fbcbe42b1da5dbb0465f93e928bc3667df Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 27 Oct 2005 17:12:52 +1000
Subject: [PATCH] --- yaml --- r: 11695 b: refs/heads/master c:
 a2b0ca84a1198505f0b3c7b55b7769dd5dbd0791 h: refs/heads/master i:   11693:
 c534b8c7c5d42979a88543cc5fa4d096aea2d7a8   11691:
 175e480b06ddc00d0c140d94113e1ff7b2eb2083   11687:
 3af9e5c08a7c7fc2ec65ecf68613e5d327a07e8e   11679:
 f90e42ba3bf4521c680b38517385f52e50edf046 v: v3

---
 [refs]                          |  2 +-
 trunk/arch/powerpc/lib/Makefile |  5 +++--
 trunk/arch/ppc64/lib/Makefile   |  2 +-
 trunk/arch/ppc64/lib/strcase.c  | 31 -------------------------------
 4 files changed, 5 insertions(+), 35 deletions(-)
 delete mode 100644 trunk/arch/ppc64/lib/strcase.c

diff --git a/[refs] b/[refs]
index 88916621efa8..80e42e5e13b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a0d8bf9cf1f9722204936d8ef53370d7ae1181d9
+refs/heads/master: a2b0ca84a1198505f0b3c7b55b7769dd5dbd0791
diff --git a/trunk/arch/powerpc/lib/Makefile b/trunk/arch/powerpc/lib/Makefile
index a7af96ce9df2..0726235ef25d 100644
--- a/trunk/arch/powerpc/lib/Makefile
+++ b/trunk/arch/powerpc/lib/Makefile
@@ -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
diff --git a/trunk/arch/ppc64/lib/Makefile b/trunk/arch/ppc64/lib/Makefile
index e8ce831d8eae..f4732c5ffd5f 100644
--- a/trunk/arch/ppc64/lib/Makefile
+++ b/trunk/arch/ppc64/lib/Makefile
@@ -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/trunk/arch/ppc64/lib/strcase.c b/trunk/arch/ppc64/lib/strcase.c
deleted file mode 100644
index e84f243368c0..000000000000
--- a/trunk/arch/ppc64/lib/strcase.c
+++ /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;
-}