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/dec | |
| 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/dec')
| -rw-r--r-- | arch/mips/dec/Platform | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/dec/Platform b/arch/mips/dec/Platform index 3adbcbd95db1..cf55a6f4e720 100644 --- a/arch/mips/dec/Platform +++ b/arch/mips/dec/Platform | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # DECstation family | 2 | # DECstation family |
| 3 | # | 3 | # |
| 4 | platform-$(CONFIG_MACH_DECSTATION) = dec/ | 4 | platform-$(CONFIG_MACH_DECSTATION) += dec/ |
| 5 | cflags-$(CONFIG_MACH_DECSTATION) += \ | 5 | cflags-$(CONFIG_MACH_DECSTATION) += \ |
| 6 | -I$(srctree)/arch/mips/include/asm/mach-dec | 6 | -I$(srctree)/arch/mips/include/asm/mach-dec |
| 7 | libs-$(CONFIG_MACH_DECSTATION) += arch/mips/dec/prom/ | 7 | libs-$(CONFIG_MACH_DECSTATION) += arch/mips/dec/prom/ |