[ARM] 4272/1: Missing symbol h1940_pm_return fix
authorKrzysztof Helt <krzysztof.h1@wp.pl>
Mon, 19 Mar 2007 14:10:20 +0000 (15:10 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 20 Mar 2007 22:42:39 +0000 (22:42 +0000)
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>
arch/arm/mach-s3c2410/mach-h1940.c
arch/arm/mach-s3c2440/mach-rx3715.c

index 01c60d0923cd49d86da8d98b31e1c4dc85ed1f41..d052ab2d937776ff24ae341a76d9dbc8b9d54e84 100644 (file)
@@ -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();
 }
 
index 480ccde63fb4e9a8d679f300255da09763f968dd..ae1d0a81fd6ac47e59f92bfad0e49139a758294e 100644 (file)
@@ -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);