diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /arch/mips/kernel/scall64-n32.S | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
Diffstat (limited to 'arch/mips/kernel/scall64-n32.S')
| -rw-r--r-- | arch/mips/kernel/scall64-n32.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S index da7f1b6ea0fb..324c5499dec2 100644 --- a/arch/mips/kernel/scall64-n32.S +++ b/arch/mips/kernel/scall64-n32.S | |||
| @@ -219,7 +219,7 @@ EXPORT(sysn32_call_table) | |||
| 219 | PTR compat_sys_getrusage | 219 | PTR compat_sys_getrusage |
| 220 | PTR compat_sys_sysinfo | 220 | PTR compat_sys_sysinfo |
| 221 | PTR compat_sys_times | 221 | PTR compat_sys_times |
| 222 | PTR sys32_ptrace | 222 | PTR compat_sys_ptrace |
| 223 | PTR sys_getuid /* 6100 */ | 223 | PTR sys_getuid /* 6100 */ |
| 224 | PTR sys_syslog | 224 | PTR sys_syslog |
| 225 | PTR sys_getgid | 225 | PTR sys_getgid |