diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-09 14:18:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-09 14:18:33 -0500 |
| commit | 0a3a98f6dd4e8f4d928a09302c0d1c56f2192ac3 (patch) | |
| tree | 92f55e374a84d06ce8213a4540454760fdecf137 /arch/frv/kernel/pm.c | |
| parent | 8ef12c9f01afba47c2d33bb939085111ca0d0f7d (diff) | |
| parent | 5367f2d67c7d0bf1faae90e6e7b4e2ac3c9b5e0f (diff) | |
Merge Linus' tree.
Diffstat (limited to 'arch/frv/kernel/pm.c')
| -rw-r--r-- | arch/frv/kernel/pm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/frv/kernel/pm.c b/arch/frv/kernel/pm.c index 712c3c24c954..f0b8fff3e733 100644 --- a/arch/frv/kernel/pm.c +++ b/arch/frv/kernel/pm.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | 13 | ||
| 14 | #include <linux/config.h> | 14 | #include <linux/config.h> |
| 15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 16 | #include <linux/module.h> | ||
| 16 | #include <linux/pm.h> | 17 | #include <linux/pm.h> |
| 17 | #include <linux/pm_legacy.h> | 18 | #include <linux/pm_legacy.h> |
| 18 | #include <linux/sched.h> | 19 | #include <linux/sched.h> |
| @@ -27,6 +28,7 @@ | |||
| 27 | #include "local.h" | 28 | #include "local.h" |
| 28 | 29 | ||
| 29 | void (*pm_power_off)(void); | 30 | void (*pm_power_off)(void); |
| 31 | EXPORT_SYMBOL(pm_power_off); | ||
| 30 | 32 | ||
| 31 | extern void frv_change_cmode(int); | 33 | extern void frv_change_cmode(int); |
| 32 | 34 | ||