diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-04-02 18:17:17 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-04-02 22:03:44 -0700 |
| commit | beca98c93dc8d838c3656bc62fd49b45622ef788 (patch) | |
| tree | 0b5f1271281bb32d902bc01a7eb9e7079e22da61 /drivers/video/backlight/locomolcd.c | |
| parent | ee5324ea33d373558da43a22f3c1074a5fd5496e (diff) | |
| download | blackbird-op-linux-beca98c93dc8d838c3656bc62fd49b45622ef788.tar.gz blackbird-op-linux-beca98c93dc8d838c3656bc62fd49b45622ef788.zip | |
ARM: fix lcd power build failure in collie_defconfig
Commit 086ada54abaa4316e8603f02410fe8ebc9ba2de1
"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: arm@kernel.org
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/video/backlight/locomolcd.c')
| -rw-r--r-- | drivers/video/backlight/locomolcd.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/video/backlight/locomolcd.c b/drivers/video/backlight/locomolcd.c index be20b5cbe26c..3a6d5419e3e3 100644 --- a/drivers/video/backlight/locomolcd.c +++ b/drivers/video/backlight/locomolcd.c @@ -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) |
