diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2009-09-15 08:50:39 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2009-09-17 14:07:43 -0400 |
commit | 1f320d053c666567a8e440ebcec4ed7f7006b006 (patch) | |
tree | cff741de3fdb3559b378672c146498e10619c335 /arch/mips | |
parent | 7e17615c45980fc34d3f7d04bc7063cfc32180ec (diff) |
MIPS: Malta: Convert reset initialization to initcall.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/mti-malta/malta-reset.c | 7 | ||||
-rw-r--r-- | arch/mips/mti-malta/malta-setup.c | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/mips/mti-malta/malta-reset.c b/arch/mips/mti-malta/malta-reset.c index f48d60e84290..329420536241 100644 --- a/arch/mips/mti-malta/malta-reset.c +++ b/arch/mips/mti-malta/malta-reset.c | |||
@@ -22,6 +22,7 @@ | |||
22 | * Reset the MIPS boards. | 22 | * Reset the MIPS boards. |
23 | * | 23 | * |
24 | */ | 24 | */ |
25 | #include <linux/init.h> | ||
25 | #include <linux/pm.h> | 26 | #include <linux/pm.h> |
26 | 27 | ||
27 | #include <asm/io.h> | 28 | #include <asm/io.h> |
@@ -45,9 +46,13 @@ static void mips_machine_halt(void) | |||
45 | } | 46 | } |
46 | 47 | ||
47 | 48 | ||
48 | void mips_reboot_setup(void) | 49 | static int __init mips_reboot_setup(void) |
49 | { | 50 | { |
50 | _machine_restart = mips_machine_restart; | 51 | _machine_restart = mips_machine_restart; |
51 | _machine_halt = mips_machine_halt; | 52 | _machine_halt = mips_machine_halt; |
52 | pm_power_off = mips_machine_halt; | 53 | pm_power_off = mips_machine_halt; |
54 | |||
55 | return 0; | ||
53 | } | 56 | } |
57 | |||
58 | arch_initcall(mips_reboot_setup); | ||
diff --git a/arch/mips/mti-malta/malta-setup.c b/arch/mips/mti-malta/malta-setup.c index dc78b8983eeb..b7f37d4982fa 100644 --- a/arch/mips/mti-malta/malta-setup.c +++ b/arch/mips/mti-malta/malta-setup.c | |||
@@ -218,7 +218,6 @@ void __init plat_mem_setup(void) | |||
218 | #if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE) | 218 | #if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE) |
219 | screen_info_setup(); | 219 | screen_info_setup(); |
220 | #endif | 220 | #endif |
221 | mips_reboot_setup(); | ||
222 | 221 | ||
223 | board_be_init = malta_be_init; | 222 | board_be_init = malta_be_init; |
224 | board_be_handler = malta_be_handler; | 223 | board_be_handler = malta_be_handler; |