projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-net
[platform/kernel/u-boot.git]
/
include
/
video_font.h
diff --git
a/include/video_font.h
b/include/video_font.h
index
6e341cf
..
96b9edb
100644
(file)
--- a/
include/video_font.h
+++ b/
include/video_font.h
@@
-8,6
+8,10
@@
#ifndef _VIDEO_FONT_
#define _VIDEO_FONT_
+#ifdef CONFIG_VIDEO_FONT_4X6
+#include <video_font_4x6.h>
+#else
#include <video_font_data.h>
+#endif
#endif /* _VIDEO_FONT_ */