diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-16 04:09:10 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-16 04:09:10 -0500 |
| commit | af2519fb2298cdf7540082c36f4d8c66bbff103f (patch) | |
| tree | 1d290d28d42d42f9e693457762c4008988628060 /arch/cris/arch-v10/kernel/entry.S | |
| parent | 961d7d0ee5150e0197cc81c2a8884ecb230276e2 (diff) | |
| parent | 7cb36b6ccdca03bd87e8faca7fd920643dd1aec7 (diff) | |
Merge branch 'linus' into core/iommu
Conflicts:
arch/ia64/include/asm/dma-mapping.h
arch/ia64/include/asm/machvec.h
arch/ia64/include/asm/machvec_sn2.h
Diffstat (limited to 'arch/cris/arch-v10/kernel/entry.S')
| -rw-r--r-- | arch/cris/arch-v10/kernel/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v10/kernel/entry.S b/arch/cris/arch-v10/kernel/entry.S index ed171d389e65..72f5cd319b97 100644 --- a/arch/cris/arch-v10/kernel/entry.S +++ b/arch/cris/arch-v10/kernel/entry.S | |||
| @@ -691,7 +691,7 @@ sys_call_table: | |||
| 691 | .long sys_uselib | 691 | .long sys_uselib |
| 692 | .long sys_swapon | 692 | .long sys_swapon |
| 693 | .long sys_reboot | 693 | .long sys_reboot |
| 694 | .long old_readdir | 694 | .long sys_old_readdir |
| 695 | .long old_mmap /* 90 */ | 695 | .long old_mmap /* 90 */ |
| 696 | .long sys_munmap | 696 | .long sys_munmap |
| 697 | .long sys_truncate | 697 | .long sys_truncate |