diff options
-rw-r--r-- | arch/mips/include/asm/mips-boards/generic.h | 2 | ||||
-rw-r--r-- | arch/mips/lemote/lm2e/reset.c | 7 | ||||
-rw-r--r-- | arch/mips/lemote/lm2e/setup.c | 3 |
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/mips/include/asm/mips-boards/generic.h b/arch/mips/include/asm/mips-boards/generic.h index c0da1a881e3d..46c08563e532 100644 --- a/arch/mips/include/asm/mips-boards/generic.h +++ b/arch/mips/include/asm/mips-boards/generic.h | |||
@@ -87,8 +87,6 @@ | |||
87 | 87 | ||
88 | extern int mips_revision_sconid; | 88 | extern int mips_revision_sconid; |
89 | 89 | ||
90 | extern void mips_reboot_setup(void); | ||
91 | |||
92 | #ifdef CONFIG_PCI | 90 | #ifdef CONFIG_PCI |
93 | extern void mips_pcibios_init(void); | 91 | extern void mips_pcibios_init(void); |
94 | #else | 92 | #else |
diff --git a/arch/mips/lemote/lm2e/reset.c b/arch/mips/lemote/lm2e/reset.c index 099387a3827a..2e64bf6929e7 100644 --- a/arch/mips/lemote/lm2e/reset.c +++ b/arch/mips/lemote/lm2e/reset.c | |||
@@ -7,6 +7,7 @@ | |||
7 | * Copyright (C) 2007 Lemote, Inc. & Institute of Computing Technology | 7 | * Copyright (C) 2007 Lemote, Inc. & Institute of Computing Technology |
8 | * Author: Fuxin Zhang, zhangfx@lemote.com | 8 | * Author: Fuxin Zhang, zhangfx@lemote.com |
9 | */ | 9 | */ |
10 | #include <linux/init.h> | ||
10 | #include <linux/pm.h> | 11 | #include <linux/pm.h> |
11 | 12 | ||
12 | #include <asm/reboot.h> | 13 | #include <asm/reboot.h> |
@@ -33,9 +34,13 @@ static void loongson2e_power_off(void) | |||
33 | loongson2e_halt(); | 34 | loongson2e_halt(); |
34 | } | 35 | } |
35 | 36 | ||
36 | void mips_reboot_setup(void) | 37 | static int __init mips_reboot_setup(void) |
37 | { | 38 | { |
38 | _machine_restart = loongson2e_restart; | 39 | _machine_restart = loongson2e_restart; |
39 | _machine_halt = loongson2e_halt; | 40 | _machine_halt = loongson2e_halt; |
40 | pm_power_off = loongson2e_power_off; | 41 | pm_power_off = loongson2e_power_off; |
42 | |||
43 | return 0; | ||
41 | } | 44 | } |
45 | |||
46 | arch_initcall(mips_reboot_setup); | ||
diff --git a/arch/mips/lemote/lm2e/setup.c b/arch/mips/lemote/lm2e/setup.c index ebd6ceaef2fd..79dae630611a 100644 --- a/arch/mips/lemote/lm2e/setup.c +++ b/arch/mips/lemote/lm2e/setup.c | |||
@@ -41,8 +41,6 @@ | |||
41 | #include <linux/screen_info.h> | 41 | #include <linux/screen_info.h> |
42 | #endif | 42 | #endif |
43 | 43 | ||
44 | extern void mips_reboot_setup(void); | ||
45 | |||
46 | unsigned long cpu_clock_freq; | 44 | unsigned long cpu_clock_freq; |
47 | unsigned long bus_clock; | 45 | unsigned long bus_clock; |
48 | unsigned int memsize; | 46 | unsigned int memsize; |
@@ -77,7 +75,6 @@ void __init plat_mem_setup(void) | |||
77 | { | 75 | { |
78 | set_io_port_base((unsigned long)ioremap(LOONGSON2E_IO_PORT_BASE, | 76 | set_io_port_base((unsigned long)ioremap(LOONGSON2E_IO_PORT_BASE, |
79 | IO_SPACE_LIMIT - LOONGSON2E_PCI_IO_START + 1)); | 77 | IO_SPACE_LIMIT - LOONGSON2E_PCI_IO_START + 1)); |
80 | mips_reboot_setup(); | ||
81 | 78 | ||
82 | __wbflush = wbflush_loongson2e; | 79 | __wbflush = wbflush_loongson2e; |
83 | 80 | ||