diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-04-26 19:11:51 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-04-26 19:11:51 +0900 |
| commit | 54b41b97fd07842d8b64963d538003c5f756ca12 (patch) | |
| tree | eb70c7c0dee9e237018c3fda0b5566d6d1338a3b /arch/sh/boards/mach-x3proto/setup.c | |
| parent | e60692b9347d17774cdad00ae2b9afd3dc5444af (diff) | |
| parent | e7dc951eecb708d4aef18db4dbf489ba282d16ff (diff) | |
Merge branch 'sh/smp'
Diffstat (limited to 'arch/sh/boards/mach-x3proto/setup.c')
| -rw-r--r-- | arch/sh/boards/mach-x3proto/setup.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/sh/boards/mach-x3proto/setup.c b/arch/sh/boards/mach-x3proto/setup.c index e284592fd42..102bf56befb 100644 --- a/arch/sh/boards/mach-x3proto/setup.c +++ b/arch/sh/boards/mach-x3proto/setup.c @@ -19,6 +19,7 @@ #include <linux/usb/r8a66597.h> #include <linux/usb/m66592.h> #include <asm/ilsel.h> +#include <asm/smp-ops.h> static struct resource heartbeat_resources[] = { [0] = { @@ -152,7 +153,13 @@ static void __init x3proto_init_irq(void) __raw_writel(__raw_readl(0xfe410000) | (1 << 21), 0xfe410000); } +static void __init x3proto_setup(char **cmdline_p) +{ + register_smp_ops(&shx3_smp_ops); +} + static struct sh_machine_vector mv_x3proto __initmv = { .mv_name = "x3proto", + .mv_setup = x3proto_setup, .mv_init_irq = x3proto_init_irq, }; |