summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorChe-Liang Chiou <clchiou@chromium.org>2011-10-21 17:04:21 +0800
committerAnatolij Gustschin <agust@denx.de>2011-11-15 23:58:26 +0100
commitd3983ee85325d2be730830ebcf82585ee7cd2ecb (patch)
tree0dba0f79d77e06c787e61d7bfb77cc2e3868a78e /drivers
parentc270730f580e85ddab82e981abf8a518f78ae803 (diff)
downloadu-boot-imx-d3983ee85325d2be730830ebcf82585ee7cd2ecb.zip
u-boot-imx-d3983ee85325d2be730830ebcf82585ee7cd2ecb.tar.gz
u-boot-imx-d3983ee85325d2be730830ebcf82585ee7cd2ecb.tar.bz2
font: split font data from video_font.h
While video_font.h is useful even without referencing the font data, it is not possible to be included multiple times because it defines font data array right in the header. This patch splits the font data array into video_font_data.h and so now video_font.h can be included multiple times. This at least solves the code duplication in board/mcc200/lcd.c. Signed-off-by: Che-Liang Chiou <clchiou@chromium.org> Acked-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/cfb_console.c1
-rw-r--r--drivers/video/sed156x.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index 4b9346a..32e890c 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -203,6 +203,7 @@
#include <linux/types.h>
#include <stdio_dev.h>
#include <video_font.h>
+#include <video_font_data.h>
#if defined(CONFIG_CMD_DATE)
#include <rtc.h>
diff --git a/drivers/video/sed156x.c b/drivers/video/sed156x.c
index 707250d..a610b74 100644
--- a/drivers/video/sed156x.c
+++ b/drivers/video/sed156x.c
@@ -41,6 +41,7 @@
/* include the font data */
#include <video_font.h>
+#include <video_font_data.h>
#if VIDEO_FONT_WIDTH != 8 || VIDEO_FONT_HEIGHT != 16
#error Expecting VIDEO_FONT_WIDTH == 8 && VIDEO_FONT_HEIGHT == 16