From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 14 Dec 2011 03:20:44 +0000 (+1100)
Subject: Merge remote-tracking branch 'pm/linux-next'
X-Git-Tag: next-20111214~33
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=58507ef72d2a883e92766c794e77e636761e1ee5;p=karo-tx-linux.git

Merge remote-tracking branch 'pm/linux-next'
---

58507ef72d2a883e92766c794e77e636761e1ee5
diff --cc arch/arm/mach-s3c64xx/pm.c
index 0868d1331912,7d3e81b9dd06..055dac90e0e2
--- a/arch/arm/mach-s3c64xx/pm.c
+++ b/arch/arm/mach-s3c64xx/pm.c
@@@ -181,10 -325,27 +325,29 @@@ static void s3c64xx_pm_prepare(void
  	__raw_writel(__raw_readl(S3C64XX_WAKEUP_STAT), S3C64XX_WAKEUP_STAT);
  }
  
- static int s3c64xx_pm_init(void)
+ int __init s3c64xx_pm_init(void)
+ {
+ 	int i;
+ 
+ 	s3c_pm_init();
+ 
+ 	for (i = 0; i < ARRAY_SIZE(s3c64xx_always_on_pm_domains); i++)
+ 		pm_genpd_init(&s3c64xx_always_on_pm_domains[i]->pd,
+ 			      &pm_domain_always_on_gov, false);
+ 
+ 	for (i = 0; i < ARRAY_SIZE(s3c64xx_pm_domains); i++)
+ 		pm_genpd_init(&s3c64xx_pm_domains[i]->pd, NULL, false);
+ 
+ 	if (dev_get_platdata(&s3c_device_fb.dev))
+ 		pm_genpd_add_device(&s3c64xx_pm_f.pd, &s3c_device_fb.dev);
+ 
+ 	return 0;
+ }
+ 
+ static __init int s3c64xx_pm_initcall(void)
  {
 +	u32 val;
 +
  	pm_cpu_prep = s3c64xx_pm_prepare;
  	pm_cpu_sleep = s3c64xx_cpu_suspend;
  	pm_uart_udivslot = 1;