summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-08-12 18:06:30 -0400
committerTom Rini <trini@ti.com>2013-08-12 18:06:30 -0400
commitc15438eaea8b854d89455ebf7a1c7c4f06fa92f5 (patch)
tree1b9f2cddd85c061fb0377681d1fee0a2904d738d /common
parentd62a89bd5b5033649a90fa5bfe0f5b32013ca8f8 (diff)
parent1dc793dd2b8fb97dddf437547d86bd5bcfdb8b29 (diff)
downloadu-boot-imx-c15438eaea8b854d89455ebf7a1c7c4f06fa92f5.zip
u-boot-imx-c15438eaea8b854d89455ebf7a1c7c4f06fa92f5.tar.gz
u-boot-imx-c15438eaea8b854d89455ebf7a1c7c4f06fa92f5.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot-video
Diffstat (limited to 'common')
-rw-r--r--common/lcd.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/common/lcd.c b/common/lcd.c
index 8d5c63c..990650c 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -51,7 +51,6 @@
/* ** FONT DATA */
/************************************************************************/
#include <video_font.h> /* Get font data, width and height */
-#include <video_font_data.h>
/************************************************************************/
/* ** LOGO DATA */