From 91935c9f19c73aefa94bd84718be3f87da1ae93c Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Sat, 10 Mar 2012 02:54:36 -0800
Subject: [PATCH] --- yaml --- r: 296602 b: refs/heads/master c:
 7537147710b5a3be5d7ff046d8c3c3f8e5e6a186 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/arm/mach-exynos/pm_domains.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 67b30fcf4fde..d6f9f67fd036 100644
--- 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
index a84df720c556..13b306808b42 100644
--- 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;
 }