lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MIPS: Malta: Convert reset initialization to initcall.

Browse Source 
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Ralf Baechle
2009-09-15 14:50:39 +02:00
parent 7e17615c45
commit 1f320d053c
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/mips/mti-malta/malta-reset.c
View File

@@ -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);

1
arch/mips/mti-malta/malta-setup.c
View File

@@ -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;