Pull video into test branch

[linux-2.6-omap-h63xx.git] / arch / ia64 / ia32 / ia32_entry.S

diff --git a/arch/ia64/ia32/ia32_entry.S b/arch/ia64/ia32/ia32_entry.S
index 494fad6bf376dfdc845b2c25f3dcdfb40a02ac93..a32cd59b81ed7e00658fd0f7b6fcf00924121736 100644 (file)
--- a/arch/ia64/ia32/ia32_entry.S
+++ b/arch/ia64/ia32/ia32_entry.S
@@ -334,7 +334,7 @@ ia32_syscall_table:
        data8 sys_setdomainname
        data8 sys32_newuname
        data8 sys32_modify_ldt
-       data8 sys_ni_syscall    /* adjtimex */
+       data8 compat_sys_adjtimex
        data8 sys32_mprotect      /* 125 */
        data8 compat_sys_sigprocmask
        data8 sys_ni_syscall    /* create_module */
@@ -469,7 +469,7 @@ ia32_syscall_table:
        data8 sys32_epoll_wait
        data8 sys_remap_file_pages
        data8 sys_set_tid_address
-       data8 sys32_timer_create
+       data8 compat_sys_timer_create
        data8 compat_sys_timer_settime  /* 260 */
        data8 compat_sys_timer_gettime
        data8 sys_timer_getoverrun