diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-04-17 16:18:22 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-04-17 16:18:28 +0200 |
commit | 5043124e660fcc3ddefe4239ddfa017bf13f5081 (patch) | |
tree | 06875cdb942afe460dbac33acf3e8223c805a35d /arch/mn10300/kernel/entry.S | |
parent | 77857dc07247ed5fa700a197c96ef842d8dbebdf (diff) | |
parent | 9f76208c33984ab777eace5d07a4e36e88703e02 (diff) |
Merge branch 'linus' into x86/apic
Merge reason: new intr-remap patches depend on the s2ram iommu fixes from upstream
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/mn10300/kernel/entry.S')
-rw-r--r-- | arch/mn10300/kernel/entry.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/mn10300/kernel/entry.S b/arch/mn10300/kernel/entry.S index ceeaaaa359e..3dc3e462f92 100644 --- a/arch/mn10300/kernel/entry.S +++ b/arch/mn10300/kernel/entry.S @@ -20,7 +20,7 @@ #include <asm/intctl-regs.h> #include <asm/busctl-regs.h> #include <asm/timer-regs.h> -#include <asm/unit/leds.h> +#include <unit/leds.h> #include <asm/page.h> #include <asm/pgtable.h> #include <asm/errno.h> @@ -723,6 +723,8 @@ ENTRY(sys_call_table) .long sys_dup3 .long sys_pipe2 .long sys_inotify_init1 + .long sys_preadv + .long sys_pwritev /* 335 */ nr_syscalls=(.-sys_call_table)/4 |