summaryrefslogtreecommitdiff
path: root/include/lcd.h
diff options
context:
space:
mode:
authorJustin Waters <justin.waters@timesys.com>2009-01-27 16:39:30 -0500
committerJustin Waters <justin.waters@timesys.com>2009-01-27 16:53:21 -0500
commit9187df48c94af2dabf4e533a62c0e0ed7bf25665 (patch)
treec4e2e3836528495b6cd77cd1dfe81a0db46cf5d1 /include/lcd.h
parent380bc0f188f8d41889fde822bcf7ed1afc96e348 (diff)
Add additional checks on CONFIG_LCD_INFO_BELOW_LOGO2009.01-at91-200901272139
CONFIG_LCD_INFO_BELOW_LOGO is really only meaningful if CONFIG_LCD_LOGO is set. We should always check to see if CONFIG_LCD_LOGO is set whenever we do anything based on it. Otherwise, we will run into compilation problems. Signed-off-by: Justin Waters <justin.waters@timesys.com>
Diffstat (limited to 'include/lcd.h')
-rw-r--r--include/lcd.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/lcd.h b/include/lcd.h
index 512221e9c4..41339d611e 100644
--- a/include/lcd.h
+++ b/include/lcd.h
@@ -223,7 +223,7 @@ void lcd_show_board_info(void);
#define LCD_COLOR16 4
/*----------------------------------------------------------------------*/
-#if defined(CONFIG_LCD_INFO_BELOW_LOGO)
+#if defined(CONFIG_LCD_LOGO) && defined(CONFIG_LCD_INFO_BELOW_LOGO)
# define LCD_INFO_X 0
# define LCD_INFO_Y (BMP_LOGO_HEIGHT + VIDEO_FONT_HEIGHT)
#elif defined(CONFIG_LCD_LOGO)