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/sysdev | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe... (diff) | |
| parent | powerpc: Convert power off logic to pm_power_off (diff) | |
| download | linux-8418804ef27e5f7988480d86ecf9dfd56cebc53b.tar.gz linux-8418804ef27e5f7988480d86ecf9dfd56cebc53b.zip | |
Merge branch 'topic/pm-power-off' into next
Diffstat (limited to 'arch/powerpc/sysdev')
| -rw-r--r-- | arch/powerpc/sysdev/fsl_soc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c index ffd1169ebaab..1e04568da3b9 100644 --- a/arch/powerpc/sysdev/fsl_soc.c +++ b/arch/powerpc/sysdev/fsl_soc.c @@ -238,7 +238,7 @@ void fsl_hv_restart(char *cmd) /* * Halt the current partition * - * This function should be assigned to the ppc_md.power_off and ppc_md.halt + * This function should be assigned to the pm_power_off and ppc_md.halt * function pointers, to shut down the partition when we're running under * the Freescale hypervisor. */ |