diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
| commit | 27b030d58c8e72fc7a95187a791bd9406e350f02 (patch) | |
| tree | ab3bab7f39a5ce5bab65578a7e08fa4dfdeb198c /arch/ia64/kernel/entry.S | |
| parent | 79d20b14a0d651f15b0ef9a22b6cf12d284a6d38 (diff) | |
| parent | 6628465e33ca694bd8fd5c3cf4eb7ff9177bc694 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/ia64/kernel/entry.S')
| -rw-r--r-- | arch/ia64/kernel/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index bd86fea49a0c..d3f093820bc7 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S | |||
| @@ -1417,7 +1417,7 @@ sys_call_table: | |||
| 1417 | data8 sys_msgrcv | 1417 | data8 sys_msgrcv |
| 1418 | data8 sys_msgctl | 1418 | data8 sys_msgctl |
| 1419 | data8 sys_shmget | 1419 | data8 sys_shmget |
| 1420 | data8 ia64_shmat | 1420 | data8 sys_shmat |
| 1421 | data8 sys_shmdt // 1115 | 1421 | data8 sys_shmdt // 1115 |
| 1422 | data8 sys_shmctl | 1422 | data8 sys_shmctl |
| 1423 | data8 sys_syslog | 1423 | data8 sys_syslog |