From 5f9f36826b9368e1f459f7c77976470bdd51190b Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Tue, 15 Sep 2009 15:00:02 +0200
Subject: [PATCH] --- yaml --- r: 162818 b: refs/heads/master c:
 38c9fb743f0d6e9dd8ee45e3e6247bc7d147c4de h: refs/heads/master v: v3

---
 [refs]                                            | 2 +-
 trunk/arch/mips/include/asm/mips-boards/generic.h | 2 --
 trunk/arch/mips/lemote/lm2e/reset.c               | 7 ++++++-
 trunk/arch/mips/lemote/lm2e/setup.c               | 3 ---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 7b3d474fc977..1d27fac512d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f320d053c666567a8e440ebcec4ed7f7006b006
+refs/heads/master: 38c9fb743f0d6e9dd8ee45e3e6247bc7d147c4de
diff --git a/trunk/arch/mips/include/asm/mips-boards/generic.h b/trunk/arch/mips/include/asm/mips-boards/generic.h
index c0da1a881e3d..46c08563e532 100644
--- a/trunk/arch/mips/include/asm/mips-boards/generic.h
+++ b/trunk/arch/mips/include/asm/mips-boards/generic.h
@@ -87,8 +87,6 @@
 
 extern int mips_revision_sconid;
 
-extern void mips_reboot_setup(void);
-
 #ifdef CONFIG_PCI
 extern void mips_pcibios_init(void);
 #else
diff --git a/trunk/arch/mips/lemote/lm2e/reset.c b/trunk/arch/mips/lemote/lm2e/reset.c
index 099387a3827a..2e64bf6929e7 100644
--- a/trunk/arch/mips/lemote/lm2e/reset.c
+++ b/trunk/arch/mips/lemote/lm2e/reset.c
@@ -7,6 +7,7 @@
  * Copyright (C) 2007 Lemote, Inc. & Institute of Computing Technology
  * Author: Fuxin Zhang, zhangfx@lemote.com
  */
+#include <linux/init.h>
 #include <linux/pm.h>
 
 #include <asm/reboot.h>
@@ -33,9 +34,13 @@ static void loongson2e_power_off(void)
 	loongson2e_halt();
 }
 
-void mips_reboot_setup(void)
+static int __init mips_reboot_setup(void)
 {
 	_machine_restart = loongson2e_restart;
 	_machine_halt = loongson2e_halt;
 	pm_power_off = loongson2e_power_off;
+
+	return 0;
 }
+
+arch_initcall(mips_reboot_setup);
diff --git a/trunk/arch/mips/lemote/lm2e/setup.c b/trunk/arch/mips/lemote/lm2e/setup.c
index ebd6ceaef2fd..79dae630611a 100644
--- a/trunk/arch/mips/lemote/lm2e/setup.c
+++ b/trunk/arch/mips/lemote/lm2e/setup.c
@@ -41,8 +41,6 @@
 #include <linux/screen_info.h>
 #endif
 
-extern void mips_reboot_setup(void);
-
 unsigned long cpu_clock_freq;
 unsigned long bus_clock;
 unsigned int memsize;
@@ -77,7 +75,6 @@ void __init plat_mem_setup(void)
 {
 	set_io_port_base((unsigned long)ioremap(LOONGSON2E_IO_PORT_BASE,
 				IO_SPACE_LIMIT - LOONGSON2E_PCI_IO_START + 1));
-	mips_reboot_setup();
 
 	__wbflush = wbflush_loongson2e;