summaryrefslogtreecommitdiff
path: root/arch/powerpc
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-11-16 20:44:03 +0100
committerWolfgang Denk <wd@denx.de>2011-11-16 20:44:03 +0100
commit9dfa8da709a1589d177d99c597d9b18d8c9a145d (patch)
treee5f42ab6c6bcfffd17eb60306ffad2c0567dac6f /arch/powerpc
parent0c2dd9a05bdcf3b2b4880509ec690116873fe158 (diff)
parenta2a5729fc1247bb45d794e9d731c0b03bf58096f (diff)
downloadu-boot-imx-9dfa8da709a1589d177d99c597d9b18d8c9a145d.zip
u-boot-imx-9dfa8da709a1589d177d99c597d9b18d8c9a145d.tar.gz
u-boot-imx-9dfa8da709a1589d177d99c597d9b18d8c9a145d.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-video
* 'master' of git://git.denx.de/u-boot-video: api: export LCD device to external apps font: split font data from video_font.h tools: logo: split bmp arrays from bmp_logo.h lcd: add clear and draw bitmap declaration VIDEO: mx3fb: GCC4.6 fix build warnings Powerpc/DIU: Fixed the 800x600 and 1024x768 resolution bug
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/cpu/mpc8xx/video.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/cpu/mpc8xx/video.c b/arch/powerpc/cpu/mpc8xx/video.c
index 7725c67..1bbf4cc 100644
--- a/arch/powerpc/cpu/mpc8xx/video.c
+++ b/arch/powerpc/cpu/mpc8xx/video.c
@@ -125,6 +125,7 @@ DECLARE_GLOBAL_DATA_PTR;
/************************************************************************/
#include <video_font.h> /* Get font data, width and height */
+#include <video_font_data.h>
#ifdef CONFIG_VIDEO_LOGO
#include <video_logo.h> /* Get logo data, width and height */