Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-linus

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

diff --git a/arch/powerpc/platforms/powernv/setup.c b/arch/powerpc/platforms/powernv/setup.c
index 3f9546d..30b1c3e 100644 (file)
--- a/arch/powerpc/platforms/powernv/setup.c
+++ b/arch/powerpc/platforms/powernv/setup.c
@@ -265,10 +265,8 @@ static unsigned long pnv_memory_block_size(void)
 static void __init pnv_setup_machdep_opal(void)
 {
        ppc_md.get_boot_time = opal_get_boot_time;
-       ppc_md.get_rtc_time = opal_get_rtc_time;
-       ppc_md.set_rtc_time = opal_set_rtc_time;
        ppc_md.restart = pnv_restart;
-       ppc_md.power_off = pnv_power_off;
+       pm_power_off = pnv_power_off;
        ppc_md.halt = pnv_halt;
        ppc_md.machine_check_exception = opal_machine_check;
        ppc_md.mce_check_early_recovery = opal_mce_check_early_recovery;
@@ -285,7 +283,7 @@ static void __init pnv_setup_machdep_rtas(void)
                ppc_md.set_rtc_time = rtas_set_rtc_time;
        }
        ppc_md.restart = rtas_restart;
-       ppc_md.power_off = rtas_power_off;
+       pm_power_off = rtas_power_off;
        ppc_md.halt = rtas_halt;
 }
 #endif /* CONFIG_PPC_POWERNV_RTAS */