diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-21 16:37:27 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-21 16:37:27 +0100 |
| commit | 77835492ed489c0b870f82f4c50687bd267acc0a (patch) | |
| tree | d80903ce1b8dd30aa44ccfc756616ad4d6c74d63 /arch/mn10300 | |
| parent | af37501c792107c2bde1524bdae38d9a247b841a (diff) | |
| parent | 1de9e8e70f5acc441550ca75433563d91b269bbe (diff) | |
| download | linux-77835492ed489c0b870f82f4c50687bd267acc0a.tar.gz linux-77835492ed489c0b870f82f4c50687bd267acc0a.tar.bz2 linux-77835492ed489c0b870f82f4c50687bd267acc0a.zip | |
Merge commit 'v2.6.29-rc2' into perfcounters/core
Conflicts:
include/linux/syscalls.h
Diffstat (limited to 'arch/mn10300')
| -rw-r--r-- | arch/mn10300/kernel/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mn10300/kernel/entry.S b/arch/mn10300/kernel/entry.S index 62fba8aa9b6e..ceeaaaa359e2 100644 --- a/arch/mn10300/kernel/entry.S +++ b/arch/mn10300/kernel/entry.S @@ -478,7 +478,7 @@ ENTRY(sys_call_table) .long sys_uselib .long sys_swapon .long sys_reboot - .long old_readdir + .long sys_old_readdir .long old_mmap /* 90 */ .long sys_munmap .long sys_truncate |