diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-20 16:18:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-20 16:18:21 -0400 |
| commit | 7d7c4d06be246b249f0f7e0b7df2f73d09cc6376 (patch) | |
| tree | 7c7d3314b7bea5fe932eb76d80d9a102ffcda204 /arch/mips/Kbuild | |
| parent | 531295e63be8c2b8b909d7400739e8b8df60d61f (diff) | |
| parent | e2cc502c3f71d8de812893527dc435e61b7fe604 (diff) | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus:
MIPS: O32 compat/N32: Fix to use compat syscall wrappers for AIO syscalls.
MAINTAINERS: Change list for ioc_serial to linux-serial.
SERIAL: ioc3_serial: Return -ENOMEM on memory allocation failure
MIPS: jz4740: Fix Kbuild Platform file.
MIPS: Repair Kbuild make clean breakage.
Diffstat (limited to 'arch/mips/Kbuild')
| -rw-r--r-- | arch/mips/Kbuild | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/mips/Kbuild b/arch/mips/Kbuild index e322d65f33a4..7dd65cfae837 100644 --- a/arch/mips/Kbuild +++ b/arch/mips/Kbuild | |||
| @@ -7,6 +7,10 @@ subdir-ccflags-y := -Werror | |||
| 7 | include arch/mips/Kbuild.platforms | 7 | include arch/mips/Kbuild.platforms |
| 8 | obj-y := $(platform-y) | 8 | obj-y := $(platform-y) |
| 9 | 9 | ||
| 10 | # make clean traverses $(obj-) without having included .config, so | ||
| 11 | # everything ends up here | ||
| 12 | obj- := $(platform-) | ||
| 13 | |||
| 10 | # mips object files | 14 | # mips object files |
| 11 | # The object files are linked as core-y files would be linked | 15 | # The object files are linked as core-y files would be linked |
| 12 | 16 | ||