diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2006-12-06 23:36:06 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:32 -0500 |
commit | 4cf303487d5dddaace2daca8437c555f3f0bc1aa (patch) | |
tree | 55d1c5e054a90d1bed587683b804576111628e66 | |
parent | 49033c81845f1bd2a69e53485f20d55a0e7bace5 (diff) |
[PATCH] Export pm_suspend for the shared APM emulation
The new shared APM emulation just like its ARM and MIPS predecessors uses
pm_suspend() which was only exported on SH. Move export to close to it's
definition where it really should be anyway.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | arch/sh/kernel/sh_ksyms.c | 4 | ||||
-rw-r--r-- | kernel/power/main.c | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/arch/sh/kernel/sh_ksyms.c b/arch/sh/kernel/sh_ksyms.c index c706f3bfd897..ceee79143401 100644 --- a/arch/sh/kernel/sh_ksyms.c +++ b/arch/sh/kernel/sh_ksyms.c | |||
@@ -99,10 +99,6 @@ EXPORT_SYMBOL(__down_trylock); | |||
99 | EXPORT_SYMBOL(synchronize_irq); | 99 | EXPORT_SYMBOL(synchronize_irq); |
100 | #endif | 100 | #endif |
101 | 101 | ||
102 | #ifdef CONFIG_PM | ||
103 | EXPORT_SYMBOL(pm_suspend); | ||
104 | #endif | ||
105 | |||
106 | EXPORT_SYMBOL(csum_partial); | 102 | EXPORT_SYMBOL(csum_partial); |
107 | #ifdef CONFIG_IPV6 | 103 | #ifdef CONFIG_IPV6 |
108 | EXPORT_SYMBOL(csum_ipv6_magic); | 104 | EXPORT_SYMBOL(csum_ipv6_magic); |
diff --git a/kernel/power/main.c b/kernel/power/main.c index 751157b7897e..500eb87f643d 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c | |||
@@ -8,6 +8,7 @@ | |||
8 | * | 8 | * |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <linux/module.h> | ||
11 | #include <linux/suspend.h> | 12 | #include <linux/suspend.h> |
12 | #include <linux/kobject.h> | 13 | #include <linux/kobject.h> |
13 | #include <linux/string.h> | 14 | #include <linux/string.h> |
@@ -230,7 +231,7 @@ int pm_suspend(suspend_state_t state) | |||
230 | return -EINVAL; | 231 | return -EINVAL; |
231 | } | 232 | } |
232 | 233 | ||
233 | 234 | EXPORT_SYMBOL(pm_suspend); | |
234 | 235 | ||
235 | decl_subsys(power,NULL,NULL); | 236 | decl_subsys(power,NULL,NULL); |
236 | 237 | ||