From 038a10220e122807a23887fd4363fc2588e98712 Mon Sep 17 00:00:00 2001 From: William Wilgus Date: Fri, 25 May 2018 19:16:45 +0200 Subject: Fix Remove lcd_scroll_worker from bootloader except remote displays/charcell This patch was supposed to only remove scroll worker from devices without remote displays, the build system said otherwise Change-Id: I240db89ee6b55818dbd2567338515b53ebe09300 fixed: conditional define --- firmware/drivers/lcd-scroll.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/firmware/drivers/lcd-scroll.c b/firmware/drivers/lcd-scroll.c index 74606b1ed7..0e17303bd3 100644 --- a/firmware/drivers/lcd-scroll.c +++ b/firmware/drivers/lcd-scroll.c @@ -200,7 +200,8 @@ bool LCDFN(scroll_now)(struct scrollinfo *s) return ended; } -#if (!defined(BOOTLOADER) && !defined(HAVE_REMOTE_LCD)) || defined(HAVE_LCD_CHARCELLS) + +#if !defined(BOOTLOADER) || defined(HAVE_REMOTE_LCD) || defined(HAVE_LCD_CHARCELLS) static void LCDFN(scroll_worker)(void) { int index; -- cgit