Commit 176dbba5 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

[PATCH] add the mini 4x6 font from uclinux

This stands alone from UCLinux and is independent of whether it ever
merges with the mainstream.  Its rather handy for getting an entire oops
onto a PDA screen
parent d4fb39fd
...@@ -435,6 +435,7 @@ if [ "$CONFIG_FB" = "y" ]; then ...@@ -435,6 +435,7 @@ if [ "$CONFIG_FB" = "y" ]; then
fi fi
bool ' Pearl (old m68k) console 8x8 font' CONFIG_FONT_PEARL_8x8 bool ' Pearl (old m68k) console 8x8 font' CONFIG_FONT_PEARL_8x8
bool ' Acorn console 8x8 font' CONFIG_FONT_ACORN_8x8 bool ' Acorn console 8x8 font' CONFIG_FONT_ACORN_8x8
bool ' Mini 4x6 font' CONFIG_FONT_MINI_4x6
else else
define_bool CONFIG_FONT_8x8 y define_bool CONFIG_FONT_8x8 y
define_bool CONFIG_FONT_8x16 y define_bool CONFIG_FONT_8x16 y
......
...@@ -28,6 +28,7 @@ obj-$(CONFIG_FONT_8x16) += font_8x16.o ...@@ -28,6 +28,7 @@ obj-$(CONFIG_FONT_8x16) += font_8x16.o
obj-$(CONFIG_FONT_6x11) += font_6x11.o obj-$(CONFIG_FONT_6x11) += font_6x11.o
obj-$(CONFIG_FONT_PEARL_8x8) += font_pearl_8x8.o obj-$(CONFIG_FONT_PEARL_8x8) += font_pearl_8x8.o
obj-$(CONFIG_FONT_ACORN_8x8) += font_acorn_8x8.o obj-$(CONFIG_FONT_ACORN_8x8) += font_acorn_8x8.o
obj-$(CONFIG_FONT_MINI_4x6) += font_mini_4x6.o
# Add fbmon.o back into obj-$(CONFIG_FB) in 2.5.x # Add fbmon.o back into obj-$(CONFIG_FB) in 2.5.x
obj-$(CONFIG_FB) += fbmem.o fbcmap.o modedb.o fbcon.o fonts.o fbgen.o obj-$(CONFIG_FB) += fbmem.o fbcmap.o modedb.o fbcon.o fonts.o fbgen.o
......
This diff is collapsed.
...@@ -56,6 +56,10 @@ static struct fbcon_font_desc *fbcon_fonts[] = { ...@@ -56,6 +56,10 @@ static struct fbcon_font_desc *fbcon_fonts[] = {
#undef NO_FONTS #undef NO_FONTS
&font_pearl_8x8, &font_pearl_8x8,
#endif #endif
#ifdef CONFIG_FONT_MINI_4x6
#undef NO_FONTS
&font_mini_4x6,
#endif
}; };
#define num_fonts (sizeof(fbcon_fonts)/sizeof(*fbcon_fonts)) #define num_fonts (sizeof(fbcon_fonts)/sizeof(*fbcon_fonts))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment