1 files changed, 15 insertions, 11 deletions
diff --git a/include/linux/font.h b/include/linux/font.h
index fc2d690c9d5f..8fc80a7d78ac 100644
--- a/include/linux/font.h
+++ b/include/linux/font.h
@@ -25,19 +25,23 @@ struct font_desc {
 #define VGA8x16_IDX     1
 #define PEARL8x8_IDX    2
 #define VGA6x11_IDX     3
-#define SUN8x16_IDX     4
+#define FONT7x14_IDX    4
-#define SUN12x22_IDX    5
+#define FONT10x18_IDX   5
-#define ACORN8x8_IDX    6
+#define SUN8x16_IDX     6
-#define MINI4x6_IDX     7
+#define SUN12x22_IDX    7
+#define ACORN8x8_IDX    8
+#define MINI4x6_IDX     9
 extern struct font_desc font_vga_8x8,
-                                font_vga_8x16,
+                        font_vga_8x16,
-                                font_pearl_8x8,
+                        font_pearl_8x8,
-                                font_vga_6x11,
+                        font_vga_6x11,
-                                font_sun_8x16,
+                        font_7x14,
-                                font_sun_12x22,
+                        font_10x18,
-                                font_acorn_8x8,
+                        font_sun_8x16,
-                                font_mini_4x6;
+                        font_sun_12x22,
+                        font_acorn_8x8,
+                        font_mini_4x6;
 /* Find a font with a specific name */

diff --git a/include/linux/font.h b/include/linux/font.h index fc2d690c9d5f..8fc80a7d78ac 100644 --- a/include/linux/font.h +++ b/include/linux/font.h
@@ -25,19 +25,23 @@ struct font_desc {
25	#define VGA8x16_IDX 1	25	#define VGA8x16_IDX 1
26	#define PEARL8x8_IDX 2	26	#define PEARL8x8_IDX 2
27	#define VGA6x11_IDX 3	27	#define VGA6x11_IDX 3
28	#define SUN8x16_IDX 4	28	#define FONT7x14_IDX 4
29	#define SUN12x22_IDX 5	29	#define FONT10x18_IDX 5
30	#define ACORN8x8_IDX 6	30	#define SUN8x16_IDX 6
31	#define MINI4x6_IDX 7	31	#define SUN12x22_IDX 7
		32	#define ACORN8x8_IDX 8
		33	#define MINI4x6_IDX 9
32		34
33	extern struct font_desc font_vga_8x8,	35	extern struct font_desc font_vga_8x8,
34	font_vga_8x16,	36	font_vga_8x16,
35	font_pearl_8x8,	37	font_pearl_8x8,
36	font_vga_6x11,	38	font_vga_6x11,
37	font_sun_8x16,	39	font_7x14,
38	font_sun_12x22,	40	font_10x18,
39	font_acorn_8x8,	41	font_sun_8x16,
40	font_mini_4x6;	42	font_sun_12x22,
		43	font_acorn_8x8,
		44	font_mini_4x6;
41		45
42	/* Find a font with a specific name */	46	/* Find a font with a specific name */
43		47