diff options
author | Krzysztof Helt <krzysztof.h1@wp.pl> | 2007-03-19 14:10:20 (GMT) |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-03-20 22:42:39 (GMT) |
commit | b1dfe1f1457a85b42544ef8b9c83c7cf9d9c3a16 (patch) | |
tree | 7409163050da3737d82ce973d0be17a3b39cd966 /arch/arm/mach-s3c2440/mach-rx3715.c | |
parent | 9d5cf5adcbb703a4c794232840c25a65a372c357 (diff) | |
download | linux-fsl-qoriq-b1dfe1f1457a85b42544ef8b9c83c7cf9d9c3a16.tar.xz |
[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-s3c2440/mach-rx3715.c')
-rw-r--r-- | arch/arm/mach-s3c2440/mach-rx3715.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2440/mach-rx3715.c b/arch/arm/mach-s3c2440/mach-rx3715.c index 480ccde..ae1d0a8 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) static void __init rx3715_init_machine(void) { +#ifdef CONFIG_PM_H1940 memcpy(phys_to_virt(H1940_SUSPEND_RESUMEAT), h1940_pm_return, 1024); +#endif s3c2410_pm_init(); s3c24xx_fb_set_platdata(&rx3715_lcdcfg); |