浏览代码

MIPS: Malta: Convert reset initialization to initcall.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle 15 年之前
父节点
当前提交
1f320d053c
共有 2 个文件被更改,包括 6 次插入2 次删除
  1. 6 1
      arch/mips/mti-malta/malta-reset.c
  2. 0 1
      arch/mips/mti-malta/malta-setup.c

+ 6 - 1
arch/mips/mti-malta/malta-reset.c

@@ -22,6 +22,7 @@
  * Reset the MIPS boards.
  * Reset the MIPS boards.
  *
  *
  */
  */
+#include <linux/init.h>
 #include <linux/pm.h>
 #include <linux/pm.h>
 
 
 #include <asm/io.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_restart = mips_machine_restart;
 	_machine_halt = mips_machine_halt;
 	_machine_halt = mips_machine_halt;
 	pm_power_off = mips_machine_halt;
 	pm_power_off = mips_machine_halt;
+
+	return 0;
 }
 }
+
+arch_initcall(mips_reboot_setup);

+ 0 - 1
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)
 #if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE)
 	screen_info_setup();
 	screen_info_setup();
 #endif
 #endif
-	mips_reboot_setup();
 
 
 	board_be_init = malta_be_init;
 	board_be_init = malta_be_init;
 	board_be_handler = malta_be_handler;
 	board_be_handler = malta_be_handler;