MTD: merge 3.18 development into -next development

[mirror_ubuntu-zesty-kernel.git] / lib / fonts / Makefile

diff --git a/lib/fonts/Makefile b/lib/fonts/Makefile
index 2761560f3f15351a1f5d6c87bbd7ca12e3377cd9..e04d010cfbf59c4df0fbad4e39305a32504e5f5a 100644 (file)
--- a/lib/fonts/Makefile
+++ b/lib/fonts/Makefile
@@ -12,6 +12,7 @@ font-objs-$(CONFIG_FONT_10x18)     += font_10x18.o
 font-objs-$(CONFIG_FONT_PEARL_8x8) += font_pearl_8x8.o
 font-objs-$(CONFIG_FONT_ACORN_8x8) += font_acorn_8x8.o
 font-objs-$(CONFIG_FONT_MINI_4x6)  += font_mini_4x6.o
+font-objs-$(CONFIG_FONT_6x10)      += font_6x10.o
 
 font-objs += $(font-objs-y)