diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 19:19:15 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 19:19:15 (GMT) |
| commit | e9d52234e35b27ea4ea5f2ab64ca47b1a0c740ab (patch) | |
| tree | 318d37a7d55c79e6f7d86163fb28e0eccbb0fe83 /arch/mips/arc/Makefile | |
| parent | 955c5038823748e529a49f0e33ab635d92843500 (diff) | |
| parent | 09af7b443c257460d45cb6c1896d29f173fef35b (diff) | |
| download | linux-fsl-qoriq-e9d52234e35b27ea4ea5f2ab64ca47b1a0c740ab.tar.xz | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Diffstat (limited to 'arch/mips/arc/Makefile')
| -rw-r--r-- | arch/mips/arc/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/arc/Makefile b/arch/mips/arc/Makefile index e842493..4f349ec 100644 --- a/arch/mips/arc/Makefile +++ b/arch/mips/arc/Makefile @@ -3,7 +3,7 @@ # lib-y += cmdline.o env.o file.o identify.o init.o \ - misc.o time.o tree.o + misc.o salone.o time.o tree.o lib-$(CONFIG_ARC_MEMORY) += memory.o lib-$(CONFIG_ARC_CONSOLE) += arc_con.o |