diff options
author | Andrzej Pietrasiewicz <andrzej.p@samsung.com> | 2012-03-09 11:25:25 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-11 01:32:31 -0500 |
commit | 72bce7b10a2dad7f6cd766a0b11ad0cf2c16f6d5 (patch) | |
tree | 549effd72969beaf6541ca3d71739629d28765c2 | |
parent | 95e874cb415d114e16ca1fa5ce00b808c092db4c (diff) |
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>
-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 16b2bd1eb461..1f81bfa15ff9 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig | |||
@@ -274,6 +274,7 @@ config MACH_NURI | |||
274 | select S3C_DEV_I2C5 | 274 | select S3C_DEV_I2C5 |
275 | select S3C_DEV_I2C6 | 275 | select S3C_DEV_I2C6 |
276 | select S5P_DEV_CSIS0 | 276 | select S5P_DEV_CSIS0 |
277 | select S5P_DEV_JPEG | ||
277 | select S5P_DEV_FIMC0 | 278 | select S5P_DEV_FIMC0 |
278 | select S5P_DEV_FIMC1 | 279 | select S5P_DEV_FIMC1 |
279 | select S5P_DEV_FIMC2 | 280 | select S5P_DEV_FIMC2 |
diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c index a0ca6307e076..92e3cf0101c4 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 = { | |||
1323 | &i2c9_gpio, | 1323 | &i2c9_gpio, |
1324 | &s3c_device_adc, | 1324 | &s3c_device_adc, |
1325 | &s5p_device_g2d, | 1325 | &s5p_device_g2d, |
1326 | &s5p_device_jpeg, | ||
1326 | &s3c_device_rtc, | 1327 | &s3c_device_rtc, |
1327 | &s5p_device_mfc, | 1328 | &s5p_device_mfc, |
1328 | &s5p_device_mfc_l, | 1329 | &s5p_device_mfc_l, |