From 1f320d053c666567a8e440ebcec4ed7f7006b006 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Tue, 15 Sep 2009 14:50:39 +0200 Subject: [PATCH] MIPS: Malta: Convert reset initialization to initcall. Signed-off-by: Ralf Baechle --- arch/mips/mti-malta/malta-reset.c | 7 ++++++- 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 f48d60e..3294205 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 #include #include @@ -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 dc78b89..b7f37d4 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; -- 2.7.4