Merge tag 'v3.18-rc1' into for_next

[firefly-linux-kernel-4.4.55.git] / lib / fonts / fonts.c

diff --git a/lib/fonts/fonts.c b/lib/fonts/fonts.c
index f947189efe6d4b961c940b7f0fa2876a6b6938e6..823376ca0a8b2a7655a51b51c39d5dd944373e61 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)