---

yaml --- r: 295935 b: refs/heads/master c: 2cd11b0 h: refs/heads/master i: 295933: 7c51677 295931: b0412ec 295927: 5d1fea7 295919: 4fe1cd0 295903: a0ad645 295871: 6c6bb63 295807: bd20f47 295679: 81aa177 295423: 1e980cc 294911: 35f6dac v: v3
git-mirror · Jan 20, 2012 · 4fc58dc · 4fc58dc
1 parent 382bd60
commit 4fc58dc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec00466944bb10d4c91d889d11cc90055115df8f
+refs/heads/master: 2cd11b09a3a0ba2f247bf740e2213b912760a1b2
diff --git a/trunk/arch/arm/mach-exynos/Kconfig b/trunk/arch/arm/mach-exynos/Kconfig
@@ -230,6 +230,7 @@ config MACH_UNIVERSAL_C210
 	select S5P_DEV_FIMC1
 	select S5P_DEV_FIMC2
 	select S5P_DEV_FIMC3
+	select S5P_DEV_G2D
 	select S5P_DEV_CSIS0
 	select S5P_DEV_FIMD0
 	select S3C_DEV_HSMMC

diff --git a/trunk/arch/arm/mach-exynos/mach-universal_c210.c b/trunk/arch/arm/mach-exynos/mach-universal_c210.c
@@ -960,6 +960,7 @@ static struct platform_device *universal_devices[] __initdata = {
 	&s5p_device_fimc1,
 	&s5p_device_fimc2,
 	&s5p_device_fimc3,
+	&s5p_device_g2d,
 	&mmc0_fixed_voltage,
 	&s3c_device_hsmmc0,
 	&s3c_device_hsmmc2,