From: Anatolij Gustschin <agust@denx.de>
Date: Fri, 27 Apr 2012 04:41:27 +0000 (+0000)
Subject: common/lcd.c: reduce one CONFIG_LCD_LOGO ifdef
X-Git-Tag: v2012.07-rc1~39^2~14
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2b5cb3d33109a67ad25d74a98f1da92a1c637ee6;p=u-boot

common/lcd.c: reduce one CONFIG_LCD_LOGO ifdef

Drop ifdef around bitmap_plot().

Signed-off-by: Anatolij Gustschin <agust@denx.de>
---

diff --git a/common/lcd.c b/common/lcd.c
index ab78525d17..fe3545a7e8 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -594,6 +594,8 @@ void bitmap_plot (int x, int y)
 
 	WATCHDOG_RESET();
 }
+#else
+static inline void bitmap_plot(int x, int y) {}
 #endif /* CONFIG_LCD_LOGO */
 
 /*----------------------------------------------------------------------*/
@@ -839,9 +841,7 @@ static void *lcd_logo (void)
 	}
 #endif /* CONFIG_SPLASH_SCREEN */
 
-#ifdef CONFIG_LCD_LOGO
-	bitmap_plot (0, 0);
-#endif /* CONFIG_LCD_LOGO */
+	bitmap_plot(0, 0);
 
 #ifdef CONFIG_LCD_INFO
 	console_col = LCD_INFO_X / VIDEO_FONT_WIDTH;