forked from luck/tmp_suning_uos_patched
[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>
This commit is contained in:
parent
9d5cf5adcb
commit
b1dfe1f145
@ -202,7 +202,9 @@ static void __init h1940_map_io(void)
|
|||||||
|
|
||||||
/* setup PM */
|
/* setup PM */
|
||||||
|
|
||||||
|
#ifdef CONFIG_PM_H1940
|
||||||
memcpy(phys_to_virt(H1940_SUSPEND_RESUMEAT), h1940_pm_return, 1024);
|
memcpy(phys_to_virt(H1940_SUSPEND_RESUMEAT), h1940_pm_return, 1024);
|
||||||
|
#endif
|
||||||
s3c2410_pm_init();
|
s3c2410_pm_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -224,7 +224,9 @@ static void __init rx3715_init_irq(void)
|
|||||||
|
|
||||||
static void __init rx3715_init_machine(void)
|
static void __init rx3715_init_machine(void)
|
||||||
{
|
{
|
||||||
|
#ifdef CONFIG_PM_H1940
|
||||||
memcpy(phys_to_virt(H1940_SUSPEND_RESUMEAT), h1940_pm_return, 1024);
|
memcpy(phys_to_virt(H1940_SUSPEND_RESUMEAT), h1940_pm_return, 1024);
|
||||||
|
#endif
|
||||||
s3c2410_pm_init();
|
s3c2410_pm_init();
|
||||||
|
|
||||||
s3c24xx_fb_set_platdata(&rx3715_lcdcfg);
|
s3c24xx_fb_set_platdata(&rx3715_lcdcfg);
|
||||||
|
Loading…
Reference in New Issue
Block a user