diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2006-01-18 12:37:07 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2006-02-07 08:30:22 -0500 |
commit | fcdb27ad1d5c66611d3df6400a9b559186f266fe (patch) | |
tree | 96560c96bb962a63ed7dd3f56d50b4a8ae41f035 /arch/mips/kernel/reset.c | |
parent | 9414d3628abb646834965b6c23b8e9064729b110 (diff) |
[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/reset.c')
-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 @@ | |||
3 | * License. See the file "COPYING" in the main directory of this archive | 3 | * License. See the file "COPYING" in the main directory of this archive |
4 | * for more details. | 4 | * for more details. |
5 | * | 5 | * |
6 | * Copyright (C) 2001 by Ralf Baechle | 6 | * Copyright (C) 2001, 06 by Ralf Baechle (ralf@linux-mips.org) |
7 | * Copyright (C) 2001 MIPS Technologies, Inc. | 7 | * Copyright (C) 2001 MIPS Technologies, Inc. |
8 | */ | 8 | */ |
9 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
10 | #include <linux/module.h> | 10 | #include <linux/module.h> |
11 | #include <linux/pm.h> | ||
11 | #include <linux/types.h> | 12 | #include <linux/types.h> |
12 | #include <linux/reboot.h> | 13 | #include <linux/reboot.h> |
14 | |||
13 | #include <asm/reboot.h> | 15 | #include <asm/reboot.h> |
14 | 16 | ||
15 | /* | 17 | /* |
@@ -19,7 +21,7 @@ | |||
19 | */ | 21 | */ |
20 | void (*_machine_restart)(char *command); | 22 | void (*_machine_restart)(char *command); |
21 | void (*_machine_halt)(void); | 23 | void (*_machine_halt)(void); |
22 | void (*_machine_power_off)(void); | 24 | void (*pm_power_off)(void); |
23 | 25 | ||
24 | void machine_restart(char *command) | 26 | void machine_restart(char *command) |
25 | { | 27 | { |
@@ -35,6 +37,6 @@ void machine_halt(void) | |||
35 | 37 | ||
36 | void machine_power_off(void) | 38 | void machine_power_off(void) |
37 | { | 39 | { |
38 | if (_machine_power_off) | 40 | if (pm_power_off) |
39 | _machine_power_off(); | 41 | pm_power_off(); |
40 | } | 42 | } |