diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-19 13:47:57 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-19 13:47:57 +0100 |
| commit | 40d743b8c16a8cf6e30c1d941aa6147f9550ea75 (patch) | |
| tree | 9fcdf9a06b18a275253048d1ea7c9803cec38845 /arch/mips/mti-malta/malta-reset.c | |
| parent | 7da18afa423f167e7ef3c9728e584d8bf05bd55a (diff) | |
| parent | 83e686ea0291ee93b87dcdc00b96443b80de56c9 (diff) | |
| download | blackbird-op-linux-40d743b8c16a8cf6e30c1d941aa6147f9550ea75.tar.gz blackbird-op-linux-40d743b8c16a8cf6e30c1d941aa6147f9550ea75.zip | |
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6
Diffstat (limited to 'arch/mips/mti-malta/malta-reset.c')
| -rw-r--r-- | arch/mips/mti-malta/malta-reset.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/mips/mti-malta/malta-reset.c b/arch/mips/mti-malta/malta-reset.c index f48d60e84290..329420536241 100644 --- a/arch/mips/mti-malta/malta-reset.c +++ b/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); |
