diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 20:38:33 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 20:38:33 -0500 |
| commit | 1ca949299260aa49eeba34ff912e2321c8b1f647 (patch) | |
| tree | bb23ca6055b30a43c6c6c51c869c66f23180bb48 /arch/mips/lib/Makefile | |
| parent | c9ce228306fda4448f5f495b4f36c07956f45acd (diff) | |
| parent | 0cfd5267476ce8051c4447988d2b0377d09188e8 (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] Cobalt: Fix UART I/O type
[MIPS] Fixup copy_from_user_inatomic
[MIPS] Fix struct sigcontext for N32 userland
[MIPS] Make some __setup functions static
[MIPS] Declare highstart_pfn, highend_pfn only if CONFIG_HIGHMEM=y
[MIPS] Allow selection of KGDB only on platforms where it's supported.
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 9e5d985936b3..2453ea244cb8 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.o memcpy.o memset.o promlib.o \ | 5 | lib-y += csum_partial.o memcpy.o memcpy-inatomic.o memset.o promlib.o \ |
| 6 | strlen_user.o strncpy_user.o strnlen_user.o uncached.o | 6 | strlen_user.o strncpy_user.o strnlen_user.o uncached.o |
| 7 | 7 | ||
| 8 | obj-y += iomap.o | 8 | obj-y += iomap.o |