diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2006-01-18 18:37:07 +0100 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2006-02-07 14:30:22 +0100 |
| commit | fcdb27ad1d5c66611d3df6400a9b559186f266fe (patch) | |
| tree | 96560c96bb962a63ed7dd3f56d50b4a8ae41f035 /arch/mips/kernel | |
| parent | [MIPS] Check function pointers are non-zero before calling. (diff) | |
| download | linux-fcdb27ad1d5c66611d3df6400a9b559186f266fe.tar.xz linux-fcdb27ad1d5c66611d3df6400a9b559186f266fe.zip | |
[MIPS] Rename _machine_power_off to pm_power_off so the kernel builds again.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel')
| -rw-r--r-- | arch/mips/kernel/reset.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/mips/kernel/reset.c b/arch/mips/kernel/reset.c index a131aa0cbe66..621037db2290 100644 --- a/arch/mips/kernel/reset.c +++ b/arch/mips/kernel/reset.c @@ -3,13 +3,15 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. * - * Copyright (C) 2001 by Ralf Baechle + * Copyright (C) 2001, 06 by Ralf Baechle (ralf@linux-mips.org) * Copyright (C) 2001 MIPS Technologies, Inc. */ #include <linux/kernel.h> #include <linux/module.h> +#include <linux/pm.h> #include <linux/types.h> #include <linux/reboot.h> + #include <asm/reboot.h> /* @@ -19,7 +21,7 @@ */ void (*_machine_restart)(char *command); void (*_machine_halt)(void); -void (*_machine_power_off)(void); +void (*pm_power_off)(void); void machine_restart(char *command) { @@ -35,6 +37,6 @@ void machine_halt(void) void machine_power_off(void) { - if (_machine_power_off) - _machine_power_off(); + if (pm_power_off) + pm_power_off(); } |