Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / arch / powerpc / platforms / 85xx / sgy_cts1000.c

diff --git a/arch/powerpc/platforms/85xx/sgy_cts1000.c b/arch/powerpc/platforms/85xx/sgy_cts1000.c
index 26bacf0ed146ea289f6f6215f080ac2949740251..79fd0dfd4b8203f95a07d6bef19407d309708772 100644 (file)
--- a/arch/powerpc/platforms/85xx/sgy_cts1000.c
+++ b/arch/powerpc/platforms/85xx/sgy_cts1000.c
@@ -120,7 +120,7 @@ static int gpio_halt_probe(struct platform_device *pdev)
 
        /* Register our halt function */
        ppc_md.halt = gpio_halt_cb;
-       ppc_md.power_off = gpio_halt_cb;
+       pm_power_off = gpio_halt_cb;
 
        printk(KERN_INFO "gpio-halt: registered GPIO %d (%d trigger, %d"
               " irq).\n", gpio, trigger, irq);
@@ -137,7 +137,7 @@ static int gpio_halt_remove(struct platform_device *pdev)
                free_irq(irq, halt_node);
 
                ppc_md.halt = NULL;
-               ppc_md.power_off = NULL;
+               pm_power_off = NULL;
 
                gpio_free(gpio);