summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Baechle2006-12-07 05:36:06 +0100
committerLinus Torvalds2006-12-07 17:39:32 +0100
commit4cf303487d5dddaace2daca8437c555f3f0bc1aa (patch)
tree55d1c5e054a90d1bed587683b804576111628e66
parent[PATCH] io/storage: Documentation update to as-iosched.txt (diff)
downloadkernel-qcow2-linux-4cf303487d5dddaace2daca8437c555f3f0bc1aa.tar.gz
kernel-qcow2-linux-4cf303487d5dddaace2daca8437c555f3f0bc1aa.tar.xz
kernel-qcow2-linux-4cf303487d5dddaace2daca8437c555f3f0bc1aa.zip
[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.c4
-rw-r--r--kernel/power/main.c3
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);
EXPORT_SYMBOL(synchronize_irq);
#endif
-#ifdef CONFIG_PM
-EXPORT_SYMBOL(pm_suspend);
-#endif
-
EXPORT_SYMBOL(csum_partial);
#ifdef CONFIG_IPV6
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 @@
*
*/
+#include <linux/module.h>
#include <linux/suspend.h>
#include <linux/kobject.h>
#include <linux/string.h>
@@ -230,7 +231,7 @@ int pm_suspend(suspend_state_t state)
return -EINVAL;
}
-
+EXPORT_SYMBOL(pm_suspend);
decl_subsys(power,NULL,NULL);