diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2014-11-05 21:00:19 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2014-11-05 21:00:19 +1100 |
| commit | 8418804ef27e5f7988480d86ecf9dfd56cebc53b (patch) | |
| tree | 576cfe0429fdf73582b6431b5cdc5f2d394d8f26 /arch/powerpc/kernel | |
| parent | 8a97577a5967c1234ccc3bc1b45e4b1a58b39ea8 (diff) | |
| parent | 9178ba294b6839eeff1a91bed95515d783f3ee6c (diff) | |
Merge branch 'topic/pm-power-off' into next
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/setup-common.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index 1362cd62b3fa..44c8d03558ac 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c @@ -139,8 +139,8 @@ void machine_restart(char *cmd) void machine_power_off(void) { machine_shutdown(); - if (ppc_md.power_off) - ppc_md.power_off(); + if (pm_power_off) + pm_power_off(); #ifdef CONFIG_SMP smp_send_stop(); #endif @@ -151,7 +151,7 @@ void machine_power_off(void) /* Used by the G5 thermal driver */ EXPORT_SYMBOL_GPL(machine_power_off); -void (*pm_power_off)(void) = machine_power_off; +void (*pm_power_off)(void); EXPORT_SYMBOL_GPL(pm_power_off); void machine_halt(void) |