summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Wilgus <me.theuser@yahoo.com>2018-05-25 19:16:45 +0200
committerWilliam Wilgus <me.theuser@yahoo.com>2018-05-25 19:16:45 +0200
commit038a10220e122807a23887fd4363fc2588e98712 (patch)
treee79cb5293831b465327e3810f2c0520896a58300
parent0999a22ef87dcf57e4c3494f2a4c6a708263ad8b (diff)
downloadrockbox-038a102.tar.gz
rockbox-038a102.tar.bz2
rockbox-038a102.zip
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
-rw-r--r--firmware/drivers/lcd-scroll.c3
1 files changed, 2 insertions, 1 deletions
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;