diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-09-01 05:57:23 (GMT) |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-09-01 05:57:32 (GMT) |
commit | 7bfb40b048aa709bb88a00a1acbadbd9f7a645ee (patch) | |
tree | 88cfef3d3facca564ad378553a838789e0c78cb1 /arch/powerpc | |
parent | 9bb7361d99fb5c510e62b521e4292581fa1bee98 (diff) | |
parent | 9e79e3e9dd9672b37ac9412e9a926714306551fe (diff) | |
download | linux-7bfb40b048aa709bb88a00a1acbadbd9f7a645ee.tar.xz |
Merge remote-tracking branch 'origin/master' into next
(Pickup Stephen's fix d4d7b2a11c423a8d4088bb0090e4c8d626d043bc)
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/include/asm/systbl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/systbl.h b/arch/powerpc/include/asm/systbl.h index f6736b7..fa0d27a 100644 --- a/arch/powerpc/include/asm/systbl.h +++ b/arch/powerpc/include/asm/systbl.h @@ -171,7 +171,7 @@ SYSCALL_SPU(setresuid) SYSCALL_SPU(getresuid) SYSCALL(ni_syscall) SYSCALL_SPU(poll) -COMPAT_SYS(nfsservctl) +SYSCALL(ni_syscall) SYSCALL_SPU(setresgid) SYSCALL_SPU(getresgid) COMPAT_SYS_SPU(prctl) |