diff options
| author | David Howells <dhowells@redhat.com> | 2006-12-05 12:01:28 -0500 |
|---|---|---|
| committer | David Howells <dhowells@warthog.cambridge.redhat.com> | 2006-12-05 12:01:28 -0500 |
| commit | 9db73724453a9350e1c22dbe732d427e2939a5c9 (patch) | |
| tree | 15e3ead6413ae97398a54292acc199bee0864d42 /arch/mips/lib-32/Makefile | |
| parent | 4c1ac1b49122b805adfa4efc620592f68dccf5db (diff) | |
| parent | e62438630ca37539c8cc1553710bbfaa3cf960a7 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/ata/libata-scsi.c
include/linux/libata.h
Futher merge of Linus's head and compilation fixups.
Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'arch/mips/lib-32/Makefile')
| -rw-r--r-- | arch/mips/lib-32/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/lib-32/Makefile b/arch/mips/lib-32/Makefile index ad285786e74b..dcd4d2ed2ac4 100644 --- a/arch/mips/lib-32/Makefile +++ b/arch/mips/lib-32/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.o memset.o watch.o | 5 | lib-y += memset.o watch.o |
| 6 | 6 | ||
| 7 | obj-$(CONFIG_CPU_MIPS32) += dump_tlb.o | 7 | obj-$(CONFIG_CPU_MIPS32) += dump_tlb.o |
| 8 | obj-$(CONFIG_CPU_MIPS64) += dump_tlb.o | 8 | obj-$(CONFIG_CPU_MIPS64) += dump_tlb.o |