diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 09:57:27 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 10:02:14 -0400 |
| commit | 71f6424023cb9fa381efc7237ca05926b2b1ca9a (patch) | |
| tree | 6c3c4a2110d0ff3d73c4bacaddb23b9295663695 /arch/arc/kernel/sys.c | |
| parent | 9bc128e16bb82c046d6972171de572affc5c4cbf (diff) | |
| parent | e933a1a12a02f42e0013cda87bba37ccb59efc47 (diff) | |
Merge branch 'mxs/cleanup' into next/multiplatform
This is a dependency for mxs/multiplatform
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Conflicts:
drivers/clocksource/Makefile
Diffstat (limited to 'arch/arc/kernel/sys.c')
| -rw-r--r-- | arch/arc/kernel/sys.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arc/kernel/sys.c b/arch/arc/kernel/sys.c index f6bdd07583f3..9d6c1ca26af6 100644 --- a/arch/arc/kernel/sys.c +++ b/arch/arc/kernel/sys.c | |||
| @@ -6,8 +6,6 @@ | |||
| 6 | #include <asm/syscalls.h> | 6 | #include <asm/syscalls.h> |
| 7 | 7 | ||
| 8 | #define sys_clone sys_clone_wrapper | 8 | #define sys_clone sys_clone_wrapper |
| 9 | #define sys_fork sys_fork_wrapper | ||
| 10 | #define sys_vfork sys_vfork_wrapper | ||
| 11 | 9 | ||
| 12 | #undef __SYSCALL | 10 | #undef __SYSCALL |
| 13 | #define __SYSCALL(nr, call) [nr] = (call), | 11 | #define __SYSCALL(nr, call) [nr] = (call), |