aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2410/mach-h1940.c
diff options
context:
space:
mode:
authorKrzysztof Helt <krzysztof.h1@wp.pl>2007-03-19 15:10:20 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-03-20 22:42:39 +0000
commitb1dfe1f1457a85b42544ef8b9c83c7cf9d9c3a16 (patch)
tree7409163050da3737d82ce973d0be17a3b39cd966 /arch/arm/mach-s3c2410/mach-h1940.c
parent[ARM] 4235/1: ns9xxx: declare the clock functions as "const" (diff)
downloadlinux-dev-b1dfe1f1457a85b42544ef8b9c83c7cf9d9c3a16.tar.xz
linux-dev-b1dfe1f1457a85b42544ef8b9c83c7cf9d9c3a16.zip
[ARM] 4272/1: Missing symbol h1940_pm_return fix
Added missing ifdefs, to make kernel linkable without the PM support. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-s3c2410/mach-h1940.c')
-rw-r--r--arch/arm/mach-s3c2410/mach-h1940.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c
index 01c60d0923cd..d052ab2d9377 100644
--- a/arch/arm/mach-s3c2410/mach-h1940.c
+++ b/arch/arm/mach-s3c2410/mach-h1940.c
@@ -202,7 +202,9 @@ static void __init h1940_map_io(void)
/* setup PM */
+#ifdef CONFIG_PM_H1940
memcpy(phys_to_virt(H1940_SUSPEND_RESUMEAT), h1940_pm_return, 1024);
+#endif
s3c2410_pm_init();
}