From 80b1cb8d9eab631424b98edc19a39609940586e2 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Tue, 15 Sep 2009 14:50:39 +0200
Subject: [PATCH] --- yaml --- r: 162817 b: refs/heads/master c:
 1f320d053c666567a8e440ebcec4ed7f7006b006 h: refs/heads/master i:   162815:
 78e05b1b98d8389846332ab559dacdf02bbac17c v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/mips/mti-malta/malta-reset.c | 7 ++++++-
 trunk/arch/mips/mti-malta/malta-setup.c | 1 -
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 750c23e95d77..7b3d474fc977 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e17615c45980fc34d3f7d04bc7063cfc32180ec
+refs/heads/master: 1f320d053c666567a8e440ebcec4ed7f7006b006
diff --git a/trunk/arch/mips/mti-malta/malta-reset.c b/trunk/arch/mips/mti-malta/malta-reset.c
index f48d60e84290..329420536241 100644
--- a/trunk/arch/mips/mti-malta/malta-reset.c
+++ b/trunk/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/trunk/arch/mips/mti-malta/malta-setup.c b/trunk/arch/mips/mti-malta/malta-setup.c
index dc78b8983eeb..b7f37d4982fa 100644
--- a/trunk/arch/mips/mti-malta/malta-setup.c
+++ b/trunk/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;