diff options
| author | Kamil Debski <k.debski@samsung.com> | 2011-12-27 17:16:47 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-01-20 09:39:36 +0900 |
| commit | ec00466944bb10d4c91d889d11cc90055115df8f (patch) | |
| tree | 6f224fce8fce0f932d396a70fa46cfbd116b7f15 | |
| parent | dcd6c92267155e70a94b3927bce681ce74b80d1f (diff) | |
| download | blackbird-op-linux-ec00466944bb10d4c91d889d11cc90055115df8f.tar.gz blackbird-op-linux-ec00466944bb10d4c91d889d11cc90055115df8f.zip | |
ARM: EXYNOS: add G2D to mach-nuri
Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| -rw-r--r-- | arch/arm/mach-exynos/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/mach-nuri.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 5d602f68a0e8..abfa9c5213e7 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -273,6 +273,7 @@ config MACH_NURI select S5P_DEV_FIMC1 select S5P_DEV_FIMC2 select S5P_DEV_FIMC3 + select S5P_DEV_G2D select S5P_DEV_MFC select S5P_DEV_USB_EHCI select S5P_SETUP_MIPIPHY diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c index b895ec031105..165c87638895 100644 --- a/arch/arm/mach-exynos/mach-nuri.c +++ b/arch/arm/mach-exynos/mach-nuri.c @@ -1259,6 +1259,7 @@ static struct platform_device *nuri_devices[] __initdata = { &s3c_device_i2c3, &i2c9_gpio, &s3c_device_adc, + &s5p_device_g2d, &s3c_device_rtc, &s5p_device_mfc, &s5p_device_mfc_l, |
