patch-2.1.111 linux/drivers/video/font_6x11.c

Next file: linux/drivers/video/font_8x16.c
Previous file: linux/drivers/video/font.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.110/linux/drivers/video/font_6x11.c linux/drivers/video/font_6x11.c
@@ -4,14 +4,11 @@
 /*                                            */
 /**********************************************/
 
-#define FONTDATAMAX (11*256)
-
-char fontname_6x11[] = "ProFont6x11";
+#include "font.h"
 
-int  fontheight_6x11 = 11;
-int  fontwidth_6x11  = 6;
+#define FONTDATAMAX (11*256)
 
-unsigned char fontdata_6x11[FONTDATAMAX] = {
+static unsigned char fontdata_6x11[FONTDATAMAX] = {
 
 	/* 0 0x00 '^A' */
 	0x00, /* 00000000 */
@@ -3343,3 +3340,12 @@
 
 };
 
+
+struct fbcon_font_desc font_vga_6x11 = {
+	VGA6x11_IDX,
+	"ProFont6x11",
+	6,
+	11,
+	fontdata_6x11,
+	-2000	/* Try avoiding this font if possible unless on MAC */
+};

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov