diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-27 08:30:07 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-27 08:30:07 -0400 |
| commit | efda9452046bdd707b23a85b7846ec33548f84f1 (patch) | |
| tree | f08c915049ea1829ba115cd41a0ba28ddf184e07 /arch/sh | |
| parent | b01f2cc1c37ac3d5ca313c90370a586dffe5aca9 (diff) | |
| parent | 36676bcbf9f6bcbea9d06e67ee8d04eacde54952 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/kernel/entry.S | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/sh/kernel/entry.S b/arch/sh/kernel/entry.S index 6615e4838e..fb6368159d 100644 --- a/arch/sh/kernel/entry.S +++ b/arch/sh/kernel/entry.S | |||
| @@ -1145,5 +1145,10 @@ ENTRY(sys_call_table) | |||
| 1145 | .long sys_add_key /* 285 */ | 1145 | .long sys_add_key /* 285 */ |
| 1146 | .long sys_request_key | 1146 | .long sys_request_key |
| 1147 | .long sys_keyctl | 1147 | .long sys_keyctl |
| 1148 | .long sys_ioprio_set | ||
| 1149 | .long sys_ioprio_get | ||
| 1150 | .long sys_inotify_init /* 290 */ | ||
| 1151 | .long sys_inotify_add_watch | ||
| 1152 | .long sys_inotify_rm_watch | ||
| 1148 | 1153 | ||
| 1149 | /* End of entry.S */ | 1154 | /* End of entry.S */ |