git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify
[pandora-kernel.git]
/
include
/
linux
/
font.h
diff --git
a/include/linux/font.h
b/include/linux/font.h
index
8aac48c
..
40a24ab
100644
(file)
--- a/
include/linux/font.h
+++ b/
include/linux/font.h
@@
-31,7
+31,6
@@
struct font_desc {
#define SUN12x22_IDX 7
#define ACORN8x8_IDX 8
#define MINI4x6_IDX 9
#define SUN12x22_IDX 7
#define ACORN8x8_IDX 8
#define MINI4x6_IDX 9
-#define RL_IDX 10
extern const struct font_desc font_vga_8x8,
font_vga_8x16,
extern const struct font_desc font_vga_8x8,
font_vga_8x16,
@@
-42,7
+41,6
@@
extern const struct font_desc font_vga_8x8,
font_sun_8x16,
font_sun_12x22,
font_acorn_8x8,
font_sun_8x16,
font_sun_12x22,
font_acorn_8x8,
- font_rl,
font_mini_4x6;
/* Find a font with a specific name */
font_mini_4x6;
/* Find a font with a specific name */
@@
-51,7
+49,8
@@
extern const struct font_desc *find_font(const char *name);
/* Get the default font for a specific screen size */
/* Get the default font for a specific screen size */
-extern const struct font_desc *get_default_font(int xres, int yres);
+extern const struct font_desc *get_default_font(int xres, int yres,
+ u32 font_w, u32 font_h);
/* Max. length for the name of a predefined font */
#define MAX_FONT_NAME 32
/* Max. length for the name of a predefined font */
#define MAX_FONT_NAME 32