ARM: S3C24XX: Fix s3c24xx build errors if !CONFIG_PM
v2: - register_syscore_ops(&s3c24xx_irq_syscore_ops) does not need to be conditionally compiled out, it is already optimized out on !CONFIG_PM - fix also s3c2412 and s3c2416 affected by the same build issue v1: s3c2440.c fails to build if !CONFIG_PM because in such case s3c2410_pm_syscore_ops is not defined. Same error should happen also in s3c2410.c and s3c2442.c Signed-off-by: Domenico Andreoli <cavokz@gmail.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
This commit is contained in:
Родитель
1052cff317
Коммит
fb630b9fc9
|
@ -170,7 +170,9 @@ int __init s3c2410_init(void)
|
||||||
{
|
{
|
||||||
printk("S3C2410: Initialising architecture\n");
|
printk("S3C2410: Initialising architecture\n");
|
||||||
|
|
||||||
|
#ifdef CONFIG_PM
|
||||||
register_syscore_ops(&s3c2410_pm_syscore_ops);
|
register_syscore_ops(&s3c2410_pm_syscore_ops);
|
||||||
|
#endif
|
||||||
register_syscore_ops(&s3c24xx_irq_syscore_ops);
|
register_syscore_ops(&s3c24xx_irq_syscore_ops);
|
||||||
|
|
||||||
return sysdev_register(&s3c2410_sysdev);
|
return sysdev_register(&s3c2410_sysdev);
|
||||||
|
|
|
@ -245,7 +245,9 @@ int __init s3c2412_init(void)
|
||||||
{
|
{
|
||||||
printk("S3C2412: Initialising architecture\n");
|
printk("S3C2412: Initialising architecture\n");
|
||||||
|
|
||||||
|
#ifdef CONFIG_PM
|
||||||
register_syscore_ops(&s3c2412_pm_syscore_ops);
|
register_syscore_ops(&s3c2412_pm_syscore_ops);
|
||||||
|
#endif
|
||||||
register_syscore_ops(&s3c24xx_irq_syscore_ops);
|
register_syscore_ops(&s3c24xx_irq_syscore_ops);
|
||||||
|
|
||||||
return sysdev_register(&s3c2412_sysdev);
|
return sysdev_register(&s3c2412_sysdev);
|
||||||
|
|
|
@ -97,7 +97,9 @@ int __init s3c2416_init(void)
|
||||||
|
|
||||||
s3c_fb_setname("s3c2443-fb");
|
s3c_fb_setname("s3c2443-fb");
|
||||||
|
|
||||||
|
#ifdef CONFIG_PM
|
||||||
register_syscore_ops(&s3c2416_pm_syscore_ops);
|
register_syscore_ops(&s3c2416_pm_syscore_ops);
|
||||||
|
#endif
|
||||||
register_syscore_ops(&s3c24xx_irq_syscore_ops);
|
register_syscore_ops(&s3c24xx_irq_syscore_ops);
|
||||||
|
|
||||||
return sysdev_register(&s3c2416_sysdev);
|
return sysdev_register(&s3c2416_sysdev);
|
||||||
|
|
|
@ -55,7 +55,9 @@ int __init s3c2440_init(void)
|
||||||
|
|
||||||
/* register suspend/resume handlers */
|
/* register suspend/resume handlers */
|
||||||
|
|
||||||
|
#ifdef CONFIG_PM
|
||||||
register_syscore_ops(&s3c2410_pm_syscore_ops);
|
register_syscore_ops(&s3c2410_pm_syscore_ops);
|
||||||
|
#endif
|
||||||
register_syscore_ops(&s3c244x_pm_syscore_ops);
|
register_syscore_ops(&s3c244x_pm_syscore_ops);
|
||||||
register_syscore_ops(&s3c24xx_irq_syscore_ops);
|
register_syscore_ops(&s3c24xx_irq_syscore_ops);
|
||||||
|
|
||||||
|
|
|
@ -169,7 +169,9 @@ int __init s3c2442_init(void)
|
||||||
{
|
{
|
||||||
printk("S3C2442: Initialising architecture\n");
|
printk("S3C2442: Initialising architecture\n");
|
||||||
|
|
||||||
|
#ifdef CONFIG_PM
|
||||||
register_syscore_ops(&s3c2410_pm_syscore_ops);
|
register_syscore_ops(&s3c2410_pm_syscore_ops);
|
||||||
|
#endif
|
||||||
register_syscore_ops(&s3c244x_pm_syscore_ops);
|
register_syscore_ops(&s3c244x_pm_syscore_ops);
|
||||||
register_syscore_ops(&s3c24xx_irq_syscore_ops);
|
register_syscore_ops(&s3c24xx_irq_syscore_ops);
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче