diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/fb.h | 2 | ||||
-rw-r--r-- | include/linux/font.h | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h index 82e39cd0c4fb..c698055266d0 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h | |||
@@ -619,7 +619,7 @@ struct fb_tilemap { | |||
619 | __u32 height; /* height of each tile in scanlines */ | 619 | __u32 height; /* height of each tile in scanlines */ |
620 | __u32 depth; /* color depth of each tile */ | 620 | __u32 depth; /* color depth of each tile */ |
621 | __u32 length; /* number of tiles in the map */ | 621 | __u32 length; /* number of tiles in the map */ |
622 | __u8 *data; /* actual tile map: a bitmap array, packed | 622 | const __u8 *data; /* actual tile map: a bitmap array, packed |
623 | to the nearest byte */ | 623 | to the nearest byte */ |
624 | }; | 624 | }; |
625 | 625 | ||
diff --git a/include/linux/font.h b/include/linux/font.h index 8fc80a7d78ac..53b129f07f6f 100644 --- a/include/linux/font.h +++ b/include/linux/font.h | |||
@@ -15,9 +15,9 @@ | |||
15 | 15 | ||
16 | struct font_desc { | 16 | struct font_desc { |
17 | int idx; | 17 | int idx; |
18 | char *name; | 18 | const char *name; |
19 | int width, height; | 19 | int width, height; |
20 | void *data; | 20 | const void *data; |
21 | int pref; | 21 | int pref; |
22 | }; | 22 | }; |
23 | 23 | ||
@@ -32,7 +32,7 @@ struct font_desc { | |||
32 | #define ACORN8x8_IDX 8 | 32 | #define ACORN8x8_IDX 8 |
33 | #define MINI4x6_IDX 9 | 33 | #define MINI4x6_IDX 9 |
34 | 34 | ||
35 | extern struct font_desc font_vga_8x8, | 35 | extern const struct font_desc font_vga_8x8, |
36 | font_vga_8x16, | 36 | font_vga_8x16, |
37 | font_pearl_8x8, | 37 | font_pearl_8x8, |
38 | font_vga_6x11, | 38 | font_vga_6x11, |
@@ -45,11 +45,11 @@ extern struct font_desc font_vga_8x8, | |||
45 | 45 | ||
46 | /* Find a font with a specific name */ | 46 | /* Find a font with a specific name */ |
47 | 47 | ||
48 | extern struct font_desc *find_font(char *name); | 48 | extern const struct font_desc *find_font(const char *name); |
49 | 49 | ||
50 | /* Get the default font for a specific screen size */ | 50 | /* Get the default font for a specific screen size */ |
51 | 51 | ||
52 | extern struct font_desc *get_default_font(int xres, int yres); | 52 | extern const struct font_desc *get_default_font(int xres, int yres); |
53 | 53 | ||
54 | /* Max. length for the name of a predefined font */ | 54 | /* Max. length for the name of a predefined font */ |
55 | #define MAX_FONT_NAME 32 | 55 | #define MAX_FONT_NAME 32 |