diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-21 04:39:51 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-21 04:39:51 -0500 |
| commit | 198030782cedf25391e67e7c88b04f87a5eb6563 (patch) | |
| tree | 5b7368c6bf052bcb4bb273497a57900720d36f51 /arch/m68knommu/kernel/syscalltable.S | |
| parent | 4ec71fa2d2c3f1040348f2604f4b8ccc833d1c2e (diff) | |
| parent | 92181f190b649f7ef2b79cbf5c00f26ccc66da2a (diff) | |
Merge branch 'x86/mm' into core/percpu
Conflicts:
arch/x86/mm/fault.c
Diffstat (limited to 'arch/m68knommu/kernel/syscalltable.S')
| -rw-r--r-- | arch/m68knommu/kernel/syscalltable.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68knommu/kernel/syscalltable.S b/arch/m68knommu/kernel/syscalltable.S index 812f8d8b7a85..5c3e3f62194a 100644 --- a/arch/m68knommu/kernel/syscalltable.S +++ b/arch/m68knommu/kernel/syscalltable.S | |||
| @@ -107,7 +107,7 @@ ENTRY(sys_call_table) | |||
| 107 | .long sys_uselib | 107 | .long sys_uselib |
| 108 | .long sys_ni_syscall /* sys_swapon */ | 108 | .long sys_ni_syscall /* sys_swapon */ |
| 109 | .long sys_reboot | 109 | .long sys_reboot |
| 110 | .long old_readdir | 110 | .long sys_old_readdir |
| 111 | .long old_mmap /* 90 */ | 111 | .long old_mmap /* 90 */ |
| 112 | .long sys_munmap | 112 | .long sys_munmap |
| 113 | .long sys_truncate | 113 | .long sys_truncate |