diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-02-27 20:12:23 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-02-27 20:12:23 -0500 |
| commit | 9f5a405b6843933c1cae5826046a5dd6357f142a (patch) | |
| tree | bcdbb0175d37b780551b71c40abcde964a8905eb /arch/m68k/kernel/process.c | |
| parent | b7cffb028abbffff3ba0b87268ecb775ed354049 (diff) | |
| parent | 051d3cbd96909b2fe6b5038e7bbe77f41356db05 (diff) | |
Merge branch 'from-linus'
Diffstat (limited to 'arch/m68k/kernel/process.c')
| -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"); |