[PATCH v2] arch/arm/mach-s5pv210: adding ifdef CONFIG_CPU_S5PV210 to fix compiling issue

Chen Gang gang.chen at asianux.com
Tue Jan 15 05:02:49 EST 2013


Hello kgene.kim

  when you have free time, please give a glance for this patch.

  I sent it according to script/get_maintainter.pl.
  if I sent to an incorrect member, please tell me, thanks.


  Regards

gchen.


于 2013年01月07日 20:31, Chen Gang 写道:
> 
>   if not define CONFIG_CPU_S5PV210
> 
>     it will define NULL in common.h for:
>       s5pv210_map_io, s5pv210_init_clocks, s5pv210_init, s5pv210_init_uarts
> 
>     so need using #ifdef CONFIG_CPU_S5PV210 for them too, in common.c.
>       or compiling issue will occur.
> 
> 
> Signed-off-by: Chen Gang <gang.chen at asianux.com>
> ---
>  arch/arm/mach-s5pv210/common.c |    9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/arch/arm/mach-s5pv210/common.c b/arch/arm/mach-s5pv210/common.c
> index 9dfe93e..5c88f88 100644
> --- a/arch/arm/mach-s5pv210/common.c
> +++ b/arch/arm/mach-s5pv210/common.c
> @@ -167,6 +167,8 @@ void __init s5pv210_init_io(struct map_desc *mach_desc, int size)
>  	s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));
>  }
>  
> +#ifdef CONFIG_CPU_S5PV210
> +
>  void __init s5pv210_map_io(void)
>  {
>  	/* initialise device information early */
> @@ -209,6 +211,9 @@ void __init s5pv210_init_clocks(int xtal)
>  	s5pv210_setup_clocks();
>  }
>  
> +#endif /* CONFIG_CPU_S5PV210 */
> +
> +
>  void __init s5pv210_init_irq(void)
>  {
>  	u32 vic[4];	/* S5PV210 supports 4 VIC */
> @@ -227,6 +232,8 @@ struct bus_type s5pv210_subsys = {
>  	.dev_name	= "s5pv210-core",
>  };
>  
> +#ifdef CONFIG_CPU_S5PV210
> +
>  static struct device s5pv210_dev = {
>  	.bus	= &s5pv210_subsys,
>  };
> @@ -249,3 +256,5 @@ void __init s5pv210_init_uarts(struct s3c2410_uartcfg *cfg, int no)
>  {
>  	s3c24xx_init_uartdevs("s5pv210-uart", s5p_uart_resources, cfg, no);
>  }
> +
> +#endif /* CONFIG_CPU_S5PV210 */
> 


-- 
Chen Gang

Asianux Corporation



More information about the linux-arm-kernel mailing list