diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:28:32 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:28:32 -0500 |
commit | a62e68488dd5ddb07776555fd7e0435c6d021ac1 (patch) | |
tree | d6cec15baa1ddfee108ef77b315dfdea5e3fa71c /arch/powerpc/kernel/systbl.S | |
parent | ab396e91bfe953db26fa1083d9c3e7a4fbe0334a (diff) | |
parent | 3b212db9217d02e623eaa12f41c9b5f8c6a99535 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/powerpc/kernel/systbl.S')
-rw-r--r-- | arch/powerpc/kernel/systbl.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/systbl.S b/arch/powerpc/kernel/systbl.S index dd2ab85e3513..68013179a503 100644 --- a/arch/powerpc/kernel/systbl.S +++ b/arch/powerpc/kernel/systbl.S | |||
@@ -239,9 +239,9 @@ SYS32ONLY(ftruncate64) | |||
239 | SYSX(sys_ni_syscall,sys_stat64,sys_stat64) | 239 | SYSX(sys_ni_syscall,sys_stat64,sys_stat64) |
240 | SYSX(sys_ni_syscall,sys_lstat64,sys_lstat64) | 240 | SYSX(sys_ni_syscall,sys_lstat64,sys_lstat64) |
241 | SYSX(sys_ni_syscall,sys_fstat64,sys_fstat64) | 241 | SYSX(sys_ni_syscall,sys_fstat64,sys_fstat64) |
242 | COMPAT_SYS(pciconfig_read) | 242 | SYSCALL(pciconfig_read) |
243 | COMPAT_SYS(pciconfig_write) | 243 | SYSCALL(pciconfig_write) |
244 | COMPAT_SYS(pciconfig_iobase) | 244 | SYSCALL(pciconfig_iobase) |
245 | SYSCALL(ni_syscall) | 245 | SYSCALL(ni_syscall) |
246 | SYSCALL(getdents64) | 246 | SYSCALL(getdents64) |
247 | SYSCALL(pivot_root) | 247 | SYSCALL(pivot_root) |