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/include | |
| parent | 8a97577a5967c1234ccc3bc1b45e4b1a58b39ea8 (diff) | |
| parent | 9178ba294b6839eeff1a91bed95515d783f3ee6c (diff) | |
| download | op-kernel-dev-8418804ef27e5f7988480d86ecf9dfd56cebc53b.zip op-kernel-dev-8418804ef27e5f7988480d86ecf9dfd56cebc53b.tar.gz | |
Merge branch 'topic/pm-power-off' into next
Diffstat (limited to 'arch/powerpc/include')
| -rw-r--r-- | arch/powerpc/include/asm/machdep.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h index 307347f..f15f15c 100644 --- a/arch/powerpc/include/asm/machdep.h +++ b/arch/powerpc/include/asm/machdep.h @@ -142,7 +142,6 @@ struct machdep_calls { #endif void (*restart)(char *cmd); - void (*power_off)(void); void (*halt)(void); void (*panic)(char *str); void (*cpu_die)(void); |
