ARM: fix lcd power build failure in collie_defconfig
authorPaul Gortmaker <paul.gortmaker@windriver.com>
Mon, 2 Apr 2012 22:17:17 +0000 (18:17 -0400)
committerOlof Johansson <olof@lixom.net>
Tue, 3 Apr 2012 05:03:44 +0000 (22:03 -0700)
commitbeca98c93dc8d838c3656bc62fd49b45622ef788
tree0b5f1271281bb32d902bc01a7eb9e7079e22da61
parentee5324ea33d373558da43a22f3c1074a5fd5496e
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>
arch/arm/mach-sa1100/collie.c
arch/arm/mach-sa1100/include/mach/collie.h
drivers/video/backlight/locomolcd.c