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

Commit 1bf1aace authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'samsung-fixes-4' of git://github.com/kgene/linux-samsung 

* 'samsung-fixes-4' of git://github.com/kgene/linux-samsung:
  ARM: S3C24XX: Fix s3c24xx build errors if !CONFIG_PM
  ARM: S5P: fix offset calculation on gpio-interrupt
parents 5117cc25 fb630b9f

arch/arm/mach-s3c2410/s3c2410.c

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

arch/arm/mach-s3c2412/s3c2412.c

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

arch/arm/mach-s3c2416/s3c2416.c

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

arch/arm/mach-s3c2440/s3c2440.c

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

arch/arm/mach-s3c2440/s3c2442.c

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