aboutsummaryrefslogtreecommitdiff
path: root/arch/mips/lib/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-15 07:36:41 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-15 07:36:41 -0700
commit0fb74dfb08b3d40e41ffdb6540078dcac433ac7a (patch)
treee4bbd3246984cb7433c7c5d0bcca2e7769fc81a6 /arch/mips/lib/Makefile
parent40796c5e8f2a93008e9034b3110a7e7b1fa0fba0 (diff)
parent4db2ce0199f04b6e99999f22e28ef9a0ae5f0d2f (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'arch/mips/lib/Makefile')
-rw-r--r--arch/mips/lib/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile
index 21b92b9dd01..03730341290 100644
--- a/arch/mips/lib/Makefile
+++ b/arch/mips/lib/Makefile
@@ -2,7 +2,7 @@
# Makefile for MIPS-specific library files..
#
-lib-y += csum_partial_copy.o dec_and_lock.o memcpy.o promlib.o \
+lib-y += csum_partial_copy.o memcpy.o promlib.o \
strlen_user.o strncpy_user.o strnlen_user.o
obj-y += iomap.o