diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-10 16:51:29 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-10 16:51:29 +1100 |
| commit | d6d93856cb90eeb07062ad938bd26f554bf1b9b9 (patch) | |
| tree | eeec5011a42f38d3dfe7b61788b7ac1cc890edeb /arch/mips/sibyte/sb1250/prom.c | |
| parent | 8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d (diff) | |
| parent | ad71f123a9e9b809f6c829db1222ce0423a1153c (diff) | |
| download | op-kernel-dev-d6d93856cb90eeb07062ad938bd26f554bf1b9b9.zip op-kernel-dev-d6d93856cb90eeb07062ad938bd26f554bf1b9b9.tar.gz | |
Merge ../powerpc-merge
Diffstat (limited to 'arch/mips/sibyte/sb1250/prom.c')
| -rw-r--r-- | arch/mips/sibyte/sb1250/prom.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/sibyte/sb1250/prom.c b/arch/mips/sibyte/sb1250/prom.c index de62ab0..742043f 100644 --- a/arch/mips/sibyte/sb1250/prom.c +++ b/arch/mips/sibyte/sb1250/prom.c @@ -24,6 +24,7 @@ #include <linux/bootmem.h> #include <linux/smp.h> #include <linux/initrd.h> +#include <linux/pm.h> #include <asm/bootinfo.h> #include <asm/reboot.h> @@ -79,7 +80,7 @@ void __init prom_init(void) { _machine_restart = (void (*)(char *))prom_linux_exit; _machine_halt = prom_linux_exit; - _machine_power_off = prom_linux_exit; + pm_power_off = prom_linux_exit; strcpy(arcs_cmdline, "root=/dev/ram0 "); |
