Hi Andrzej,
Tried applying this patch on the for-next branch of Kukjin Kim's tree [1].
It fails to apply
"error: patch failed: arch/arm/mach-exynos/Kconfig:274"
[Patch 1/2] applies cleanly though.
[1] git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
Regards
Sachin
On 21/02/2012, Andrzej Pietrasiewicz <andrzej.p@xxxxxxxxxxx> wrote:
> ARM: Exynos: Register JPEG on nuri
>
> Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@xxxxxxxxxxx>
> Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
> ---
> arch/arm/mach-exynos/Kconfig | 1 +
> 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 23b6971..189a212 100644
> --- a/arch/arm/mach-exynos/Kconfig
> +++ b/arch/arm/mach-exynos/Kconfig
> @@ -274,6 +274,7 @@ config MACH_NURI
> select S3C_DEV_I2C3
> select S3C_DEV_I2C5
> 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 b62e02b..be7bfd2 100644
> --- a/arch/arm/mach-exynos/mach-nuri.c
> +++ b/arch/arm/mach-exynos/mach-nuri.c
> @@ -1260,6 +1260,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,
> --
> 1.7.0.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc"
> in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
With warm regards,
Sachin
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
