ARM: fix lcd power build failure in collie_defconfig

Commit 086ada54ab

  "FB: sa1100: remove global sa1100fb_.*_power function pointers"

got rid of all instances but one in locomolcd.c -- which was
conditional on CONFIG_SA1100_COLLIE.  The associated .power
field which replaces the global is populated in mach-sa1100/collie.c
so move the assignment there, but make it conditional on the
locomolcd support, so use CONFIG_BACKLIGHT_LOCOMO in that file.

Cc: [email protected]
Acked-by: Russell King <[email protected]>
Signed-off-by: Paul Gortmaker <[email protected]>
Signed-off-by: Olof Johansson <[email protected]>
This commit is contained in:
Paul Gortmaker 2012-04-02 18:17:17 -04:00 • committed by Olof Johansson
commit beca98c93d
3 changed files with 7 additions and 9 deletions

View file

@ -229,14 +229,7 @@ static struct locomo_driver poodle_lcd_driver = {
static int __init locomolcd_init(void)
{
int ret = locomo_driver_register(&poodle_lcd_driver);
if (ret)
return ret;
#ifdef CONFIG_SA1100_COLLIE
sa1100fb_lcd_power = locomolcd_power;
#endif
return 0;
return locomo_driver_register(&poodle_lcd_driver);
}
static void __exit locomolcd_exit(void)