diff options
author | Krzysztof Helt <krzysztof.h1@wp.pl> | 2007-03-19 10:10:20 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-03-20 18:42:39 -0400 |
commit | b1dfe1f1457a85b42544ef8b9c83c7cf9d9c3a16 (patch) | |
tree | 7409163050da3737d82ce973d0be17a3b39cd966 /arch | |
parent | 9d5cf5adcbb703a4c794232840c25a65a372c357 (diff) |
[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')
-rw-r--r-- | arch/arm/mach-s3c2410/mach-h1940.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/mach-rx3715.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c index 01c60d0923c..d052ab2d937 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) | |||
202 | 202 | ||
203 | /* setup PM */ | 203 | /* setup PM */ |
204 | 204 | ||
205 | #ifdef CONFIG_PM_H1940 | ||
205 | memcpy(phys_to_virt(H1940_SUSPEND_RESUMEAT), h1940_pm_return, 1024); | 206 | memcpy(phys_to_virt(H1940_SUSPEND_RESUMEAT), h1940_pm_return, 1024); |
207 | #endif | ||
206 | s3c2410_pm_init(); | 208 | s3c2410_pm_init(); |
207 | } | 209 | } |
208 | 210 | ||
diff --git a/arch/arm/mach-s3c2440/mach-rx3715.c b/arch/arm/mach-s3c2440/mach-rx3715.c index 480ccde63fb..ae1d0a81fd6 100644 --- a/arch/arm/mach-s3c2440/mach-rx3715.c +++ b/arch/arm/mach-s3c2440/mach-rx3715.c | |||
@@ -224,7 +224,9 @@ static void __init rx3715_init_irq(void) | |||
224 | 224 | ||
225 | static void __init rx3715_init_machine(void) | 225 | static void __init rx3715_init_machine(void) |
226 | { | 226 | { |
227 | #ifdef CONFIG_PM_H1940 | ||
227 | memcpy(phys_to_virt(H1940_SUSPEND_RESUMEAT), h1940_pm_return, 1024); | 228 | memcpy(phys_to_virt(H1940_SUSPEND_RESUMEAT), h1940_pm_return, 1024); |
229 | #endif | ||
228 | s3c2410_pm_init(); | 230 | s3c2410_pm_init(); |
229 | 231 | ||
230 | s3c24xx_fb_set_platdata(&rx3715_lcdcfg); | 232 | s3c24xx_fb_set_platdata(&rx3715_lcdcfg); |