Merge rsync://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / include / linux / font.h

diff --git a/include/linux/font.h b/include/linux/font.h
index fc2d690c9d5f42ff15fe356ad138c48e2af5cb2c..8fc80a7d78ac2e131ce8b7dea5095499a4aa94e5 100644 (file)
--- 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 SUN12x22_IDX   5
-#define ACORN8x8_IDX   6
-#define        MINI4x6_IDX     7
+#define FONT7x14_IDX   4
+#define        FONT10x18_IDX   5
+#define SUN8x16_IDX    6
+#define SUN12x22_IDX   7
+#define ACORN8x8_IDX   8
+#define        MINI4x6_IDX     9
 
 extern struct font_desc        font_vga_8x8,
-                               font_vga_8x16,
-                               font_pearl_8x8,
-                               font_vga_6x11,
-                               font_sun_8x16,
-                               font_sun_12x22,
-                               font_acorn_8x8,
-                               font_mini_4x6;
+                       font_vga_8x16,
+                       font_pearl_8x8,
+                       font_vga_6x11,
+                       font_7x14,
+                       font_10x18,
+                       font_sun_8x16,
+                       font_sun_12x22,
+                       font_acorn_8x8,
+                       font_mini_4x6;
 
 /* Find a font with a specific name */