diff options
Diffstat (limited to 'arch/powerpc/platforms/maple/setup.c')
-rw-r--r-- | arch/powerpc/platforms/maple/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c index cb1b0b35a0c6..56b85cd61aaf 100644 --- a/arch/powerpc/platforms/maple/setup.c +++ b/arch/powerpc/platforms/maple/setup.c | |||
@@ -169,7 +169,7 @@ static void __init maple_use_rtas_reboot_and_halt_if_present(void) | |||
169 | if (rtas_service_present("system-reboot") && | 169 | if (rtas_service_present("system-reboot") && |
170 | rtas_service_present("power-off")) { | 170 | rtas_service_present("power-off")) { |
171 | ppc_md.restart = rtas_restart; | 171 | ppc_md.restart = rtas_restart; |
172 | ppc_md.power_off = rtas_power_off; | 172 | pm_power_off = rtas_power_off; |
173 | ppc_md.halt = rtas_halt; | 173 | ppc_md.halt = rtas_halt; |
174 | } | 174 | } |
175 | } | 175 | } |
@@ -312,6 +312,7 @@ static int __init maple_probe(void) | |||
312 | alloc_dart_table(); | 312 | alloc_dart_table(); |
313 | 313 | ||
314 | hpte_init_native(); | 314 | hpte_init_native(); |
315 | pm_power_off = maple_power_off; | ||
315 | 316 | ||
316 | return 1; | 317 | return 1; |
317 | } | 318 | } |
@@ -325,7 +326,6 @@ define_machine(maple) { | |||
325 | .pci_irq_fixup = maple_pci_irq_fixup, | 326 | .pci_irq_fixup = maple_pci_irq_fixup, |
326 | .pci_get_legacy_ide_irq = maple_pci_get_legacy_ide_irq, | 327 | .pci_get_legacy_ide_irq = maple_pci_get_legacy_ide_irq, |
327 | .restart = maple_restart, | 328 | .restart = maple_restart, |
328 | .power_off = maple_power_off, | ||
329 | .halt = maple_halt, | 329 | .halt = maple_halt, |
330 | .get_boot_time = maple_get_boot_time, | 330 | .get_boot_time = maple_get_boot_time, |
331 | .set_rtc_time = maple_set_rtc_time, | 331 | .set_rtc_time = maple_set_rtc_time, |