diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 05:51:24 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 05:51:24 -0500 |
commit | 3b621ee5df437d3f332a635ab6421aaa61a7dc2b (patch) | |
tree | c4a5236cee8eb7418770802313d36a55f1cc0b1e /include/linux/font.h | |
parent | 7211bb9b64f17b23834d91fc3d0c1d78671ee9a8 (diff) | |
parent | 5e04e7fe774794b837e1d3897e6b96ae2d06679a (diff) |
Merge branch 'master'
Diffstat (limited to 'include/linux/font.h')
-rw-r--r-- | include/linux/font.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/font.h b/include/linux/font.h index 53b129f07f6f..8aac48c37f3d 100644 --- a/include/linux/font.h +++ b/include/linux/font.h | |||
@@ -31,6 +31,7 @@ struct font_desc { | |||
31 | #define SUN12x22_IDX 7 | 31 | #define SUN12x22_IDX 7 |
32 | #define ACORN8x8_IDX 8 | 32 | #define ACORN8x8_IDX 8 |
33 | #define MINI4x6_IDX 9 | 33 | #define MINI4x6_IDX 9 |
34 | #define RL_IDX 10 | ||
34 | 35 | ||
35 | extern const struct font_desc font_vga_8x8, | 36 | extern const struct font_desc font_vga_8x8, |
36 | font_vga_8x16, | 37 | font_vga_8x16, |
@@ -41,6 +42,7 @@ extern const struct font_desc font_vga_8x8, | |||
41 | font_sun_8x16, | 42 | font_sun_8x16, |
42 | font_sun_12x22, | 43 | font_sun_12x22, |
43 | font_acorn_8x8, | 44 | font_acorn_8x8, |
45 | font_rl, | ||
44 | font_mini_4x6; | 46 | font_mini_4x6; |
45 | 47 | ||
46 | /* Find a font with a specific name */ | 48 | /* Find a font with a specific name */ |