diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2009-09-15 14:50:39 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2009-09-17 20:07:43 +0200 |
| commit | 1f320d053c666567a8e440ebcec4ed7f7006b006 (patch) | |
| tree | cff741de3fdb3559b378672c146498e10619c335 /arch/mips | |
| parent | 7e17615c45980fc34d3f7d04bc7063cfc32180ec (diff) | |
| download | blackbird-op-linux-1f320d053c666567a8e440ebcec4ed7f7006b006.tar.gz blackbird-op-linux-1f320d053c666567a8e440ebcec4ed7f7006b006.zip | |
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 @@ * Reset the MIPS boards. * */ +#include <linux/init.h> #include <linux/pm.h> #include <asm/io.h> @@ -45,9 +46,13 @@ static void mips_machine_halt(void) } -void mips_reboot_setup(void) +static int __init mips_reboot_setup(void) { _machine_restart = mips_machine_restart; _machine_halt = mips_machine_halt; pm_power_off = mips_machine_halt; + + return 0; } + +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) #if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE) screen_info_setup(); #endif - mips_reboot_setup(); board_be_init = malta_be_init; board_be_handler = malta_be_handler; |
