diff options
author | 2006-01-31 10:20:49 -0800 | |
---|---|---|
committer | 2006-01-31 10:20:49 -0800 | |
commit | f7dd16bf3a2e7e29670051a2488d4be1895e408d (patch) | |
tree | 8778621ad8bf9bec35d285c4a7aa423609771bea /arch/sparc64/kernel/sys32.S | |
parent | Don't try to "validate" a non-existing timeval. (diff) | |
parent | [SPARC]: Fix compile failures in math-emu. (diff) | |
download | linux-dev-f7dd16bf3a2e7e29670051a2488d4be1895e408d.tar.xz linux-dev-f7dd16bf3a2e7e29670051a2488d4be1895e408d.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'arch/sparc64/kernel/sys32.S')
-rw-r--r-- | arch/sparc64/kernel/sys32.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/sys32.S b/arch/sparc64/kernel/sys32.S index 9cd272ac3ac1..60b59375aa78 100644 --- a/arch/sparc64/kernel/sys32.S +++ b/arch/sparc64/kernel/sys32.S @@ -84,7 +84,6 @@ SIGN2(sys32_fadvise64_64, compat_sys_fadvise64_64, %o0, %o5) SIGN2(sys32_bdflush, sys_bdflush, %o0, %o1) SIGN1(sys32_mlockall, sys_mlockall, %o0) SIGN1(sys32_nfsservctl, compat_sys_nfsservctl, %o0) -SIGN1(sys32_clock_settime, compat_sys_clock_settime, %o1) SIGN1(sys32_clock_nanosleep, compat_sys_clock_nanosleep, %o1) SIGN1(sys32_timer_settime, compat_sys_timer_settime, %o1) SIGN1(sys32_io_submit, compat_sys_io_submit, %o1) |