Merge branch 'pm-fixes' into pm-domains

Merge commit e8b364b88c (PM / Clocks: Do not acquire a mutex under a spinlock) fixing a regression in drivers/base/power/clock_ops.c. Conflicts: drivers/base/power/clock_ops.c
2011-09-26 20:12:45 +02:00
parent a0089bd617 e8b364b88c
commit 0d41da2e31
713 changed files with 6468 additions and 4158 deletions
@@ -1413,7 +1413,7 @@ static void __init ap4evb_init(void)
 	fsi_init_pm_clock();
 	sh7372_pm_init();
 	pm_clk_add(&fsi_device.dev, "spu2");
-	pm_clk_add(&hdmi_lcdc_device.dev, "hdmi");
+	pm_clk_add(&lcdc1_device.dev, "hdmi");
 }

 static void __init ap4evb_timer_init(void)