summaryrefslogtreecommitdiff
path: root/arch/arm/mach-exynos
diff options
context:
space:
mode:
authorAndrzej Pietrasiewicz <andrzej.p@samsung.com>2012-03-09 16:25:25 (GMT)
committerKukjin Kim <kgene.kim@samsung.com>2012-03-11 06:32:31 (GMT)
commit72bce7b10a2dad7f6cd766a0b11ad0cf2c16f6d5 (patch)
tree549effd72969beaf6541ca3d71739629d28765c2 /arch/arm/mach-exynos
parent95e874cb415d114e16ca1fa5ce00b808c092db4c (diff)
downloadlinux-72bce7b10a2dad7f6cd766a0b11ad0cf2c16f6d5.tar.xz
ARM: EXYNOS: Register JPEG on nuri
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-exynos')
-rw-r--r--arch/arm/mach-exynos/Kconfig1
-rw-r--r--arch/arm/mach-exynos/mach-nuri.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 16b2bd1..1f81bfa 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -274,6 +274,7 @@ config MACH_NURI
select S3C_DEV_I2C5
select S3C_DEV_I2C6
select S5P_DEV_CSIS0
+ select S5P_DEV_JPEG
select S5P_DEV_FIMC0
select S5P_DEV_FIMC1
select S5P_DEV_FIMC2
diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c
index a0ca630..92e3cf0 100644
--- a/arch/arm/mach-exynos/mach-nuri.c
+++ b/arch/arm/mach-exynos/mach-nuri.c
@@ -1323,6 +1323,7 @@ static struct platform_device *nuri_devices[] __initdata = {
&i2c9_gpio,
&s3c_device_adc,
&s5p_device_g2d,
+ &s5p_device_jpeg,
&s3c_device_rtc,
&s5p_device_mfc,
&s5p_device_mfc_l,