diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-20 23:09:44 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-20 23:09:44 -0500 |
| commit | cf70a6f264f6e1a4c06553699159d94996b2f916 (patch) | |
| tree | 7a5993585e7e8b80c37cae75468fca45da6519d2 /arch | |
| parent | 0b1fc9b86f49e1e73e473e06a16556ca0dce53ae (diff) | |
| parent | ad6b97fc929e5844bfd1d708ab1d74d131d7960d (diff) | |
Merge branch 'fixes.b8' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/m68k/kernel/process.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c index 3f9cb55d0356..2d8ad0727b6b 100644 --- a/arch/m68k/kernel/process.c +++ b/arch/m68k/kernel/process.c | |||
| @@ -129,6 +129,9 @@ void machine_power_off(void) | |||
| 129 | for (;;); | 129 | for (;;); |
| 130 | } | 130 | } |
| 131 | 131 | ||
| 132 | void (*pm_power_off)(void) = machine_power_off; | ||
| 133 | EXPORT_SYMBOL(pm_power_off); | ||
| 134 | |||
| 132 | void show_regs(struct pt_regs * regs) | 135 | void show_regs(struct pt_regs * regs) |
| 133 | { | 136 | { |
| 134 | printk("\n"); | 137 | printk("\n"); |