[RFC PATCH 4/7] ARM: s3c64xx: Fix build error with CONFIG_S3C_DEV_FB disabled

Tomasz Figa tomasz.figa at gmail.com
Wed Jan 9 19:32:23 EST 2013


Hi Kukjin,

On Wednesday 09 of January 2013 16:15:23 Kukjin Kim wrote:
> Tomasz Figa wrote:
> > If there is no board selecting CONFIG_S3C_DEV_FB enabled, build will
> > fail
> on
> 
> > arch/arm/mach-s3c64xx/pm.c, where s3c_device_fb is referenced.
> > 
> > This patch adds ifdef guard around the code making it compile only
> > when
> > CONFIG_S3C_DEV_FB is enabled.
> > 
> > Signed-off-by: Tomasz Figa <tomasz.figa at gmail.com>
> > ---
> > 
> >  arch/arm/mach-s3c64xx/pm.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/arch/arm/mach-s3c64xx/pm.c b/arch/arm/mach-s3c64xx/pm.c
> > index f6b13a2..3686785 100644
> > --- a/arch/arm/mach-s3c64xx/pm.c
> > +++ b/arch/arm/mach-s3c64xx/pm.c
> > @@ -338,10 +338,10 @@ int __init s3c64xx_pm_init(void)
> > 
> >  	for (i = 0; i < ARRAY_SIZE(s3c64xx_pm_domains); i++)
> >  	
> >  		pm_genpd_init(&s3c64xx_pm_domains[i]->pd, NULL, false);
> > 
> > -
> > +#ifdef CONFIG_S3C_DEV_FB
> > 
> >  	if (dev_get_platdata(&s3c_device_fb.dev))
> >  	
> >  		pm_genpd_add_device(&s3c64xx_pm_f.pd,
> > 
> > &s3c_device_fb.dev);
> > -
> > +#endif
> > 
> >  	return 0;
> >  
> >  }
> > 
> > --
> > 1.8.1
> 
> This should be separated patch from this series as a fix.

Right.
 
> Let me pick this up into -fixes.

No problem.

Best regards,
Tomasz Figa




More information about the linux-arm-kernel mailing list