diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-14 06:40:19 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-14 06:40:19 +0300 |
| commit | a110d514a582553e7439e92d92fb062d80b3e21d (patch) | |
| tree | aa8fd4abd430fa393c00e880d7d8145e4f7ee0a2 /arch/parisc | |
| parent | 934a3595b30c986bab52bc9c08d12c8962c88c8a (diff) | |
| parent | 28b2425ac76b0f043f2efd34521f2a3c7ec8ccc5 (diff) | |
| download | linux-a110d514a582553e7439e92d92fb062d80b3e21d.tar.xz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
Diffstat (limited to 'arch/parisc')
| -rw-r--r-- | arch/parisc/kernel/syscall_table.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S index 51d2480627d1..66224f710e85 100644 --- a/arch/parisc/kernel/syscall_table.S +++ b/arch/parisc/kernel/syscall_table.S @@ -377,8 +377,8 @@ ENTRY_SAME(inotify_init) ENTRY_SAME(inotify_add_watch) /* 270 */ ENTRY_SAME(inotify_rm_watch) - ENTRY_COMP(pselect6) - ENTRY_COMP(ppoll) + ENTRY_SAME(ni_syscall) /* 271 ENTRY_COMP(pselect6) */ + ENTRY_SAME(ni_syscall) /* 272 ENTRY_COMP(ppoll) */ ENTRY_SAME(migrate_pages) ENTRY_COMP(openat) /* 275 */ ENTRY_SAME(mkdirat) |