From: Andrzej Pietrasiewicz Date: Fri, 9 Mar 2012 16:25:25 +0000 (-0800) Subject: ARM: EXYNOS: Register JPEG on nuri X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=72bce7b10a2dad7f6cd766a0b11ad0cf2c16f6d5;p=linux-beck.git ARM: EXYNOS: Register JPEG on nuri Signed-off-by: Andrzej Pietrasiewicz Signed-off-by: Kyungmin Park Signed-off-by: Kukjin Kim --- 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 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 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 = { &i2c9_gpio, &s3c_device_adc, &s5p_device_g2d, + &s5p_device_jpeg, &s3c_device_rtc, &s5p_device_mfc, &s5p_device_mfc_l,