[GIT PULL] Samsung devel-2 for v3.5

[Sachin Kamat]

Hi Arnd,

Thomas has posted a patch [1] (available on Grant's tree) to fix this problem.

[1] http://git.secretlab.ca/?p=linux-2.6.git;a=commitdiff;h=766644d2df254934d656a0a0628b636212c24f9e;hp=0034102808e0dbbf3a2394b82b1bb40b5778de9e



On 17/05/2012, Arnd Bergmann <arnd at arndb.de> wrote:
> On Wednesday 16 May 2012, Kukjin Kim wrote:
>
>> Note, this branch has a dependency on next/cleanup-plat-s5p which is
>> already
>> in next/cleanup2 of arm-soc.
>>
>> If any problems, please kindly let me know.
>
> I've hit a build problem with exynos4_defconfig, which I fixed using this
> patch.
>
> 	Arnd
>
> commit 820f3dd7964f1889baaaaa0c2ba45d05bb619f66
> Author: Arnd Bergmann <arnd at arndb.de>
> Date:   Wed May 16 22:10:14 2012 +0200
>
>     ARM: exynos: fix building with CONFIG_OF disabled
>
>     irq_of_parse_and_map does not have an empty definition for the
>     !CONFIG_OF case, so we should not try to call it then:
>
>     arch/arm/mach-exynos/common.c: In function 'combiner_init':
>     arch/arm/mach-exynos/common.c:576:3: warning: implicit declaration of
> function 'irq_of_parse_and_map'
>
>     Signed-off-by: Arnd Bergmann <arnd at arndb.de>
>
> diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c
> index 9900158..4913471 100644
> --- a/arch/arm/mach-exynos/common.c
> +++ b/arch/arm/mach-exynos/common.c
> @@ -568,7 +568,11 @@ void __init combiner_init(void __iomem *combiner_base,
> struct device_node *np)
>
>  	for (i = 0; i < max_nr; i++) {
>  		combiner_init_one(i, combiner_base + (i >> 2) * 0x10);
> -		irq = np ? irq_of_parse_and_map(np, i) : IRQ_SPI(i);
> +		irq = IRQ_SPI(i);
> +#ifdef CONFIG_OF
> +		if (np)
> +			irq = irq_of_parse_and_map(np, i);
> +#endif
>  		combiner_cascade_irq(i, irq);
>  	}
>  }
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc"
> in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>


-- 
With warm regards,
Sachin