summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2015-10-02 08:20:35 +0200
committerTom Rini <trini@konsulko.com>2015-10-11 17:12:09 -0400
commit04386f656bbc35abd7718a4bbbba7fcfb4f59aef (patch)
tree7358bb617f05f24a0f2faf7198165efe1d0191c8 /drivers/video
parent1254b44a9f31c78ce7325eb392eaa949a2c7fc9a (diff)
downloadtalos-obmc-uboot-04386f656bbc35abd7718a4bbbba7fcfb4f59aef.tar.gz
talos-obmc-uboot-04386f656bbc35abd7718a4bbbba7fcfb4f59aef.zip
Revert "powerpc: ppc4xx: remove lwmon5 support"
This reverts commit 8fe11b8901a31d11990488c82bc23612589d57be. I'll add support to lwmon5 in the next patch and will remove support for the broken lcd4_lwmon5 as well. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
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
OpenPOWER on IntegriCloud