diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-15 00:02:28 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-15 00:02:28 +0100 |
commit | 1db3706b05b11abcf2673ffbed5ad43b4c90ed11 (patch) | |
tree | 09fa867d9d9db6ed475eaa889da143603441e1a6 /arch/xtensa/include/asm/unistd.h | |
parent | ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893 (diff) | |
parent | 63d15148b6058ab0037343390e8918503ed81968 (diff) | |
download | blackbird-op-linux-1db3706b05b11abcf2673ffbed5ad43b4c90ed11.tar.gz blackbird-op-linux-1db3706b05b11abcf2673ffbed5ad43b4c90ed11.zip |
Merge branch 'zImage_DTB_append' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/xtensa/include/asm/unistd.h')
-rw-r--r-- | arch/xtensa/include/asm/unistd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/include/asm/unistd.h b/arch/xtensa/include/asm/unistd.h index a6f934f37f1a..798ee6d285a1 100644 --- a/arch/xtensa/include/asm/unistd.h +++ b/arch/xtensa/include/asm/unistd.h @@ -455,7 +455,7 @@ __SYSCALL(203, sys_reboot, 3) #define __NR_quotactl 204 __SYSCALL(204, sys_quotactl, 4) #define __NR_nfsservctl 205 -__SYSCALL(205, sys_nfsservctl, 3) +__SYSCALL(205, sys_ni_syscall, 0) #define __NR__sysctl 206 __SYSCALL(206, sys_sysctl, 1) #define __NR_bdflush 207 |