Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/include/linux/font.h b/include/linux/font.h
index fc2d690..53b129f 100644 (file)
--- a/include/linux/font.h
+++ b/include/linux/font.h
@@ -15,9 +15,9 @@
 
 struct font_desc {
     int idx;
-    char *name;
+    const char *name;
     int width, height;
-    void *data;
+    const void *data;
     int pref;
 };
 
@@ -25,27 +25,31 @@ 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
-
-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;
+#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 const struct font_desc  font_vga_8x8,
+                       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 */
 
-extern struct font_desc *find_font(char *name);
+extern const struct font_desc *find_font(const char *name);
 
 /* Get the default font for a specific screen size */
 
-extern struct font_desc *get_default_font(int xres, int yres);
+extern const struct font_desc *get_default_font(int xres, int yres);
 
 /* Max. length for the name of a predefined font */
 #define MAX_FONT_NAME  32