diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-27 20:01:25 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-27 20:01:25 +0000 |
| commit | 459d2a9f5fcf125ba736f7843189ccdfba11b1ff (patch) | |
| tree | 6664f0ae653081521a3e1df0c506a2532ae6168e /arch/xtensa/include/asm/syscall.h | |
| parent | 1428c20f7c38e9fbf59923d1b9615ebdaf2862b7 (diff) | |
| parent | 9489e9dcae718d5fde988e4a684a0f55b5f94d17 (diff) | |
Merge tag 'v3.7-rc7' into asoc-ux500
Linux 3.7-rc7
Diffstat (limited to 'arch/xtensa/include/asm/syscall.h')
| -rw-r--r-- | arch/xtensa/include/asm/syscall.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/include/asm/syscall.h b/arch/xtensa/include/asm/syscall.h index c1dacca312f3..124aeee0d381 100644 --- a/arch/xtensa/include/asm/syscall.h +++ b/arch/xtensa/include/asm/syscall.h @@ -10,7 +10,7 @@ struct pt_regs; struct sigaction; -asmlinkage long xtensa_execve(char*, char**, char**, struct pt_regs*); +asmlinkage long sys_execve(char*, char**, char**, struct pt_regs*); asmlinkage long xtensa_clone(unsigned long, unsigned long, struct pt_regs*); asmlinkage long xtensa_ptrace(long, long, long, long); asmlinkage long xtensa_sigreturn(struct pt_regs*); |