diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2014-11-05 05:00:19 -0500 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2014-11-05 05:00:19 -0500 |
| commit | 8418804ef27e5f7988480d86ecf9dfd56cebc53b (patch) | |
| tree | 576cfe0429fdf73582b6431b5cdc5f2d394d8f26 /arch/powerpc/sysdev | |
| parent | 8a97577a5967c1234ccc3bc1b45e4b1a58b39ea8 (diff) | |
| parent | 9178ba294b6839eeff1a91bed95515d783f3ee6c (diff) | |
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) | |||
| 238 | /* | 238 | /* |
| 239 | * Halt the current partition | 239 | * Halt the current partition |
| 240 | * | 240 | * |
| 241 | * This function should be assigned to the ppc_md.power_off and ppc_md.halt | 241 | * This function should be assigned to the pm_power_off and ppc_md.halt |
| 242 | * function pointers, to shut down the partition when we're running under | 242 | * function pointers, to shut down the partition when we're running under |
| 243 | * the Freescale hypervisor. | 243 | * the Freescale hypervisor. |
| 244 | */ | 244 | */ |