diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-04 22:23:34 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-04 22:23:34 -0500 |
| commit | 91f433cacc9d1ae95ae46ce26d7bcf3a724c72d0 (patch) | |
| tree | 058a5961548d489fdaffdbcfb7b34893946d37cf /arch/mips/lib-64/Makefile | |
| parent | 15a4cb9c25df05a5d4844e80a1aea83d66165868 (diff) | |
| parent | 0004a9dfeaa709a7f853487aba19932c9b1a87c8 (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Cleanup memory barriers for weakly ordered systems.
[MIPS] Alchemy: Automatically enable CONFIG_RESOURCES_64BIT for PCI configs.
[MIPS] Unify csum_partial.S
[MIPS] SWARM: Fix a typo in #error directives
[MIPS] Fix atomic.h build errors.
[MIPS] Use SYSVIPC_COMPAT to fix various problems on N32
[MIPS] klconfig add missing bracket
Diffstat (limited to 'arch/mips/lib-64/Makefile')
| -rw-r--r-- | arch/mips/lib-64/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/lib-64/Makefile b/arch/mips/lib-64/Makefile index ad285786e74b..dcd4d2ed2ac4 100644 --- a/arch/mips/lib-64/Makefile +++ b/arch/mips/lib-64/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 |