Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1dfe1f1 authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Russell King
Browse files

[ARM] 4272/1: Missing symbol h1940_pm_return fix 



Added missing ifdefs, to make kernel linkable without the PM support.

Signed-off-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 9d5cf5ad

arch/arm/mach-s3c2410/mach-h1940.c

+2 −0
Original line number Diff line number Diff line
@@ -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();

}

arch/arm/mach-s3c2440/mach-rx3715.c

+2 −0
Original line number Diff line number Diff line
@@ -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);