diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
| commit | 9caafa6c8686e319cf4d5f3757b3972c6c522b7c (patch) | |
| tree | b38979b835b5d22e681b175d0b98a3c7560d9c59 /arch/sparc/kernel/process.c | |
| parent | 51e9f2ff83df6b1c81c5c44f4486c68ed87aa20e (diff) | |
| parent | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/sparc/kernel/process.c')
| -rw-r--r-- | arch/sparc/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/process.c b/arch/sparc/kernel/process.c index fbb05a452e51..118cac84a0f5 100644 --- a/arch/sparc/kernel/process.c +++ b/arch/sparc/kernel/process.c | |||
| @@ -54,7 +54,7 @@ void (*pm_idle)(void); | |||
| 54 | * This is done via auxio, but could be used as a fallback | 54 | * This is done via auxio, but could be used as a fallback |
| 55 | * handler when auxio is not present-- unused for now... | 55 | * handler when auxio is not present-- unused for now... |
| 56 | */ | 56 | */ |
| 57 | void (*pm_power_off)(void); | 57 | void (*pm_power_off)(void) = machine_power_off; |
| 58 | 58 | ||
| 59 | /* | 59 | /* |
| 60 | * sysctl - toggle power-off restriction for serial console | 60 | * sysctl - toggle power-off restriction for serial console |