diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-15 10:36:41 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-15 10:36:41 -0400 |
commit | 0fb74dfb08b3d40e41ffdb6540078dcac433ac7a (patch) | |
tree | e4bbd3246984cb7433c7c5d0bcca2e7769fc81a6 /arch/mips/lib/Makefile | |
parent | 40796c5e8f2a93008e9034b3110a7e7b1fa0fba0 (diff) | |
parent | 4db2ce0199f04b6e99999f22e28ef9a0ae5f0d2f (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/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile index 21b92b9dd013..037303412909 100644 --- a/arch/mips/lib/Makefile +++ b/arch/mips/lib/Makefile | |||
@@ -2,7 +2,7 @@ | |||
2 | # Makefile for MIPS-specific library files.. | 2 | # Makefile for MIPS-specific library files.. |
3 | # | 3 | # |
4 | 4 | ||
5 | lib-y += csum_partial_copy.o dec_and_lock.o memcpy.o promlib.o \ | 5 | lib-y += csum_partial_copy.o memcpy.o promlib.o \ |
6 | strlen_user.o strncpy_user.o strnlen_user.o | 6 | strlen_user.o strncpy_user.o strnlen_user.o |
7 | 7 | ||
8 | obj-y += iomap.o | 8 | obj-y += iomap.o |