Merge branches 'ib-mfd-gpio-i2c-3.19', 'ib-mfd-iio-3.19' and 'ib-mfd-regulator-v3...

[firefly-linux-kernel-4.4.55.git] / include / linux / font.h

diff --git a/include/linux/font.h b/include/linux/font.h
index 8aac48c37f3db1c7ef6fa00383e1a41a987d44d2..d6821769dd1e1433901314eea114d5d58189b59b 100644 (file)
--- a/include/linux/font.h
+++ b/include/linux/font.h
@@ -31,7 +31,7 @@ struct font_desc {
 #define SUN12x22_IDX   7
 #define ACORN8x8_IDX   8
 #define        MINI4x6_IDX     9
-#define        RL_IDX  10
+#define FONT6x10_IDX   10
 
 extern const struct font_desc  font_vga_8x8,
                        font_vga_8x16,
@@ -42,8 +42,8 @@ extern const struct font_desc font_vga_8x8,
                        font_sun_8x16,
                        font_sun_12x22,
                        font_acorn_8x8,
-                       font_rl,
-                       font_mini_4x6;
+                       font_mini_4x6,
+                       font_6x10;
 
 /* Find a font with a specific name */
 
@@ -51,7 +51,8 @@ extern const struct font_desc *find_font(const char *name);
 
 /* 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