@@ -130,6 +130,7 @@ static void __init celleb_setup_arch_beat(void)
#endif
celleb_setup_arch_common();
+ pm_power_off = beat_power_off;
}
static int __init celleb_probe_beat(void)
@@ -178,6 +179,7 @@ static void __init celleb_setup_arch_native(void)
/* XXX: nvram initialization should be added */
celleb_setup_arch_common();
+ pm_power_off = rtas_power_off;
}
static int __init celleb_probe_native(void)
@@ -204,7 +206,6 @@ define_machine(celleb_beat) {
.setup_arch = celleb_setup_arch_beat,
.show_cpuinfo = celleb_show_cpuinfo,
.restart = beat_restart,
- .power_off = beat_power_off,
.halt = beat_halt,
.get_rtc_time = beat_get_rtc_time,
.set_rtc_time = beat_set_rtc_time,
@@ -230,7 +231,6 @@ define_machine(celleb_native) {
.setup_arch = celleb_setup_arch_native,
.show_cpuinfo = celleb_show_cpuinfo,
.restart = rtas_restart,
- .power_off = rtas_power_off,
.halt = rtas_halt,
.get_boot_time = rtas_get_boot_time,
.get_rtc_time = rtas_get_rtc_time,
The generic power off callback is pm_power_off. Use that one rather than the powerpc specific ppc_md.power_off. Signed-off-by: Alexander Graf <agraf@suse.de> --- arch/powerpc/platforms/cell/celleb_setup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)