Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / arch / powerpc / platforms / cell / setup.c

diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c
index 6ae25fb..d62aa98 100644 (file)
--- a/arch/powerpc/platforms/cell/setup.c
+++ b/arch/powerpc/platforms/cell/setup.c
@@ -259,6 +259,7 @@ static int __init cell_probe(void)
                return 0;
 
        hpte_init_native();
+       pm_power_off = rtas_power_off;
 
        return 1;
 }
@@ -269,7 +270,6 @@ define_machine(cell) {
        .setup_arch             = cell_setup_arch,
        .show_cpuinfo           = cell_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,