diff options
author | Tony Lindgren <tony@atomide.com> | 2011-09-22 16:38:39 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-09-22 16:38:39 -0700 |
commit | 7a04c4cbf73953f1995a141534b7fe0c35828057 (patch) | |
tree | 8b83a813600605510bd54cadb81f296d342e1b6b /arch/parisc/kernel/syscall_table.S | |
parent | f8cf8e47fb87e3b27e63d36fc8d61b11273f37bc (diff) | |
parent | fbe01f51a8260c1f0a66e8730c4fd2c5160ecb91 (diff) |
Merge branch 'for_3.2/omap_device' of git://gitorious.org/khilman/linux-omap-pm into cleanup
Diffstat (limited to 'arch/parisc/kernel/syscall_table.S')
-rw-r--r-- | arch/parisc/kernel/syscall_table.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S index e66366fd2ab..3735abd7f8f 100644 --- a/arch/parisc/kernel/syscall_table.S +++ b/arch/parisc/kernel/syscall_table.S @@ -259,7 +259,7 @@ ENTRY_SAME(ni_syscall) /* query_module */ ENTRY_SAME(poll) /* structs contain pointers and an in_addr... */ - ENTRY_COMP(nfsservctl) + ENTRY_SAME(ni_syscall) /* was nfsservctl */ ENTRY_SAME(setresgid) /* 170 */ ENTRY_SAME(getresgid) ENTRY_SAME(prctl) |