From 4fc58dc31a5080c3898d5c1aa98da32ecc86ba57 Mon Sep 17 00:00:00 2001 From: Kamil Debski Date: Tue, 27 Dec 2011 17:16:50 +0900 Subject: [PATCH] --- yaml --- r: 295935 b: refs/heads/master c: 2cd11b09a3a0ba2f247bf740e2213b912760a1b2 h: refs/heads/master i: 295933: 7c51677cc6b691e0d1af218da3c29b94d4af5418 295931: b0412ecd710354236ba81a7c9dda57f7d3f9dbbb 295927: 5d1fea7a6afb22ba7049df83052385ee82442aaa 295919: 4fe1cd0b5e12a3c61f908600151ea48a1134945c 295903: a0ad6455c855d12264639385cc1c8239cb826e2d 295871: 6c6bb63855ec75252d1f5940d67a3439d2d3d798 295807: bd20f47f87ec82fa73bafad0420e813a86cd2a7d 295679: 81aa1775b53af68c6cade1442bd8a791c624d3d2 295423: 1e980cc1626de16993032f0f3477e0fddb743d2c 294911: 35f6dac3f64b3fad7bff5dbe7847545534ed4009 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-exynos/Kconfig | 1 + trunk/arch/arm/mach-exynos/mach-universal_c210.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5e178b30cdb0..d605bd6a7016 100644 --- 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 index abfa9c5213e7..e7830fd4bc31 100644 --- 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 index 37ac93e8d6d9..dd7510170e5a 100644 --- 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,