summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorStefano Babic <sbabic@denx.de>2015-10-15 15:34:14 +0200
committerStefano Babic <sbabic@denx.de>2015-10-15 15:34:14 +0200
commitf74dc51bcab924a30e41b33981a4f96af3f9dd57 (patch)
tree560eead1ca9984554be3a5c9a5332b531c102cb0 /drivers/video
parentcf04ad3219260c3c39ec3dbfe2427e3463e8dbd5 (diff)
parent297faccca2235e359012118495b9b73451d54bb9 (diff)
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/mb862xx.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/mb862xx.c b/drivers/video/mb862xx.c
index 868c51254d..1c74e97c5e 100644
--- a/drivers/video/mb862xx.c
+++ b/drivers/video/mb862xx.c
@@ -419,7 +419,8 @@ void *video_hw_init (void)
board_disp_init ();
#endif
-#if defined(CONFIG_SOCRATES) && !(CONFIG_POST & CONFIG_SYS_POST_SYSMON)
+#if (defined(CONFIG_LWMON5) || \
+ defined(CONFIG_SOCRATES)) && !(CONFIG_POST & CONFIG_SYS_POST_SYSMON)
/* Lamp on */
board_backlight_switch (1);
#endif