projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'iwlwifi-for-john-2014-10-23' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
lib
/
fonts
/
fonts.c
diff --git
a/lib/fonts/fonts.c
b/lib/fonts/fonts.c
index
f947189
..
823376c
100644
(file)
--- a/
lib/fonts/fonts.c
+++ b/
lib/fonts/fonts.c
@@
-63,6
+63,10
@@
static const struct font_desc *fonts[] = {
#undef NO_FONTS
&font_mini_4x6,
#endif
+#ifdef CONFIG_FONT_6x10
+#undef NO_FONTS
+ &font_6x10,
+#endif
};
#define num_fonts ARRAY_SIZE(fonts)