diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 01:02:04 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 01:02:04 -0400 |
| commit | b2382b363df828f25e35ed8b70a3da33b29b2a64 (patch) | |
| tree | 23aa2e70ba4650390c9281b3696172313bdb0f38 /arch/sh/kernel/entry.S | |
| parent | 1b5cca3a88b7682d538d129c25f0e3092613a243 (diff) | |
| parent | 0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf (diff) | |
Merge upstream into ieee80211.
Hand-fix merge conflict in drivers/usb/net/zd1201.c.
Diffstat (limited to 'arch/sh/kernel/entry.S')
| -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 6615e4838ee4..fb6368159dd0 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 */ |