---

yaml --- r: 296602 b: refs/heads/master c: 7537147 h: refs/heads/master v: v3
git-mirror · Mar 10, 2012 · 91935c9 · 91935c9
1 parent c47e731
commit 91935c9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a9e87bd93636f92e717c505a5ba8c587bbe0ea1c
+refs/heads/master: 7537147710b5a3be5d7ff046d8c3c3f8e5e6a186
diff --git a/trunk/arch/arm/mach-exynos/pm_domains.c b/trunk/arch/arm/mach-exynos/pm_domains.c
@@ -185,6 +185,9 @@ static __init int exynos4_pm_init_power_domain(void)
 #endif
 #ifdef CONFIG_S5P_DEV_G2D
 	exynos_pm_add_dev_to_genpd(&s5p_device_g2d, &exynos4_pd_lcd0);
+#endif
+#ifdef CONFIG_S5P_DEV_JPEG
+	exynos_pm_add_dev_to_genpd(&s5p_device_jpeg, &exynos4_pd_cam);
 #endif
 	return 0;
 }