---

yaml --- r: 11695 b: refs/heads/master c: a2b0ca8 h: refs/heads/master i: 11693: c534b8c 11691: 175e480 11687: 3af9e5c 11679: f90e42b v: v3
git-mirror · Oct 28, 2005 · 9e1e04f · 9e1e04f
1 parent aed0826
commit 9e1e04f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 35 deletions.
diff --git 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
@@ -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
@@ -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