diff options
| author | Tom Rini <trini@ti.com> | 2013-08-12 18:06:30 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-08-12 18:06:30 -0400 |
| commit | c15438eaea8b854d89455ebf7a1c7c4f06fa92f5 (patch) | |
| tree | 1b9f2cddd85c061fb0377681d1fee0a2904d738d /arch/powerpc | |
| parent | d62a89bd5b5033649a90fa5bfe0f5b32013ca8f8 (diff) | |
| parent | 1dc793dd2b8fb97dddf437547d86bd5bcfdb8b29 (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-video
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/cpu/mpc8xx/video.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/cpu/mpc8xx/video.c b/arch/powerpc/cpu/mpc8xx/video.c index 02cd0debc2..02a0467896 100644 --- a/arch/powerpc/cpu/mpc8xx/video.c +++ b/arch/powerpc/cpu/mpc8xx/video.c @@ -109,7 +109,6 @@ 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 */ |