From c270730f580e85ddab82e981abf8a518f78ae803 Mon Sep 17 00:00:00 2001 From: Che-Liang Chiou Date: Thu, 20 Oct 2011 23:04:20 +0000 Subject: tools: logo: split bmp arrays from bmp_logo.h The generated header bmp_logo.h is useful even outside common/lcd.c for the logo dimension. However, the problem is, the generated bmp_logo.h cannot be included multiple times because bmp_logo_palette[] and bmp_logo_bitmap[] are defined in the bmp_logo.h. This patch fixes this by defining these arrays in another header bmp_logo_data.h and in bmp_logo.h only declaring these arrays. Signed-off-by: Che-Liang Chiou Acked-by: Mike Frysinger Signed-off-by: Anatolij Gustschin --- drivers/video/cfb_console.c | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers') diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index 561883a1fc..4b9346aa54 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -286,6 +286,7 @@ void console_cursor(int state); #ifdef CONFIG_VIDEO_LOGO #ifdef CONFIG_VIDEO_BMP_LOGO #include +#include #define VIDEO_LOGO_WIDTH BMP_LOGO_WIDTH #define VIDEO_LOGO_HEIGHT BMP_LOGO_HEIGHT #define VIDEO_LOGO_LUT_OFFSET BMP_LOGO_OFFSET -- cgit v1.2.1